10.52.0

New Crowdin translations

Dockerfile

@@ -1,8 +1,7 @@
-FROM alpine:3.8 AS base
+FROM node:11-alpine AS base
 
 ENV NODE_ENV=production
 
-RUN apk add --no-cache nodejs nodejs-npm zlib
 RUN npm i -g npm@latest
 
 WORKDIR /misskey

locales/ca-ES.yml

@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
   destroy: "アンケートを破棄"
 common/views/components/reaction-picker.vue:
   choose-reaction: "リアクションを選択"
+common/views/components/emoji-picker.vue:
+  custom-emoji: "カスタム絵文字"
+  people: "人"
+  animals-and-nature: "動物&自然"
+  food-and-drink: "食べ物&飲み物"
+  activity: "アクティビティ"
+  travel-and-places: "場所"
+  objects: "物"
+  symbols: "記号"
+  flags: "旗"
 common/views/components/signin.vue:
   username: "ユーザー名"
   password: "パスワード"
@@ -353,6 +363,7 @@ common/views/components/signin.vue:
   or: "または"
   signin-with-twitter: "Twitterでログイン"
   signin-with-github: "GitHubでログイン"
+  signin-with-discord: "Discordでログイン"
   login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
   invitation-code: "招待コード"
@@ -398,6 +409,13 @@ common/views/components/github-setting.vue:
   reconnect: "再接続する"
   connect: "GitHubと接続する"
   disconnect: "切断する"
+common/views/components/discord-setting.vue:
+  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
+  connected-to: "次のDiscordアカウントに接続されています"
+  detail: "詳細..."
+  reconnect: "再接続する"
+  connect: "Discordと接続する"
+  disconnect: "切断する"
 common/views/components/uploader.vue:
   waiting: "待機中"
 common/views/components/visibility-chooser.vue:
@@ -588,12 +606,6 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
-desktop/views/components/follow-button.vue:
-  following: "フォロー中"
-  follow: "フォロー"
-  request-pending: "フォロー許可待ち"
-  follow-processing: "フォロー処理中"
-  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
   followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -829,6 +841,10 @@ common/views/components/mute-and-block.vue:
   block: "ブロック"
   no-muted-users: "ミュートしているユーザーはいません"
   no-blocked-users: "ブロックしているユーザーはいません"
+  word-mute: "ワードミュート"
+  muted-words: "ミュートされたキーワード"
+  muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
+  save: "保存"
 common/views/components/password-settings.vue:
   reset: "パスワードを変更する"
   enter-current-password: "現在のパスワードを入力してください"
@@ -903,6 +919,7 @@ admin/views/index.vue:
   dashboard: "ダッシュボード"
   instance: "インスタンス"
   emoji: "カスタム絵文字"
+  moderators: "モデレーター"
   users: "ユーザー"
   update: "更新"
   announcements: "お知らせ"
@@ -947,7 +964,12 @@ admin/views/instance.vue:
   github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
   enable-github-integration: "GitHub連携を有効にする"
   github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
+  discord-integration-config: "Discord連携の設定"
+  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  enable-discord-integration: "Discord連携を有効にする"
+  discord-integration-client-id: "Client ID"
+  discord-integration-client-secret: "Client Secret"
   proxy-account-config: "プロキシアカウントの設定"
   proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
   proxy-account-username: "プロキシアカウントのユーザー名"
@@ -997,6 +1019,11 @@ admin/views/users.vue:
   unverify-user: "ユーザーの公式アカウント解除"
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
+admin/views/moderators.vue:
+  add-moderator:
+    title: "モデレーターの登録"
+    add: "登録"
+    added: "モデレーターを登録しました"
 admin/views/emoji.vue:
   add-emoji:
     title: "絵文字の登録"
@@ -1161,7 +1188,7 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
   request-pending: "フォロー許可待ち"
@@ -1324,6 +1351,10 @@ mobile/views/pages/settings.vue:
   github-connect: "GitHubアカウントに接続する"
   github-reconnect: "再接続する"
   github-disconnect: "切断する"
+  discord: "Discord連携"
+  discord-connect: "Discordアカウントに接続する"
+  discord-reconnect: "再接続する"
+  discord-disconnect: "切断する"
   update: "Misskey Update"
   version: "バージョン:"
   latest-version: "最新のバージョン:"

locales/de-DE.yml

@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
   destroy: "Diese Abstimmung löschen"
 common/views/components/reaction-picker.vue:
   choose-reaction: "Wähle eine Reaktion aus"
+common/views/components/emoji-picker.vue:
+  custom-emoji: "カスタム絵文字"
+  people: "人"
+  animals-and-nature: "動物&自然"
+  food-and-drink: "食べ物&飲み物"
+  activity: "アクティビティ"
+  travel-and-places: "場所"
+  objects: "物"
+  symbols: "記号"
+  flags: "旗"
 common/views/components/signin.vue:
   username: "Benutzername"
   password: "Passwort"
@@ -353,6 +363,7 @@ common/views/components/signin.vue:
   or: "Oder"
   signin-with-twitter: "Twitterでログイン"
   signin-with-github: "GitHubでログイン"
+  signin-with-discord: "Discordでログイン"
   login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
   invitation-code: "招待コード"
@@ -398,6 +409,13 @@ common/views/components/github-setting.vue:
   reconnect: "再接続する"
   connect: "GitHubと接続する"
   disconnect: "切断する"
+common/views/components/discord-setting.vue:
+  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
+  connected-to: "次のDiscordアカウントに接続されています"
+  detail: "詳細..."
+  reconnect: "再接続する"
+  connect: "Discordと接続する"
+  disconnect: "切断する"
 common/views/components/uploader.vue:
   waiting: "Warten"
 common/views/components/visibility-chooser.vue:
@@ -588,12 +606,6 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
-desktop/views/components/follow-button.vue:
-  following: "Folge ich"
-  follow: "Folgen"
-  request-pending: "Ausstehend"
-  follow-processing: "フォロー処理中"
-  follow-request: "Follower-Anfragen"
 desktop/views/components/followers-window.vue:
   followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -829,6 +841,10 @@ common/views/components/mute-and-block.vue:
   block: "ブロック"
   no-muted-users: "ミュートしているユーザーはいません"
   no-blocked-users: "ブロックしているユーザーはいません"
+  word-mute: "ワードミュート"
+  muted-words: "ミュートされたキーワード"
+  muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
+  save: "保存"
 common/views/components/password-settings.vue:
   reset: "パスワードを変更する"
   enter-current-password: "現在のパスワードを入力してください"
@@ -903,6 +919,7 @@ admin/views/index.vue:
   dashboard: "ダッシュボード"
   instance: "インスタンス"
   emoji: "カスタム絵文字"
+  moderators: "モデレーター"
   users: "ユーザー"
   update: "更新"
   announcements: "お知らせ"
@@ -947,7 +964,12 @@ admin/views/instance.vue:
   github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
   enable-github-integration: "GitHub連携を有効にする"
   github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
+  discord-integration-config: "Discord連携の設定"
+  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  enable-discord-integration: "Discord連携を有効にする"
+  discord-integration-client-id: "Client ID"
+  discord-integration-client-secret: "Client Secret"
   proxy-account-config: "プロキシアカウントの設定"
   proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
   proxy-account-username: "プロキシアカウントのユーザー名"
@@ -997,6 +1019,11 @@ admin/views/users.vue:
   unverify-user: "ユーザーの公式アカウント解除"
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
+admin/views/moderators.vue:
+  add-moderator:
+    title: "モデレーターの登録"
+    add: "登録"
+    added: "モデレーターを登録しました"
 admin/views/emoji.vue:
   add-emoji:
     title: "絵文字の登録"
@@ -1161,7 +1188,7 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
   request-pending: "フォロー許可待ち"
@@ -1324,6 +1351,10 @@ mobile/views/pages/settings.vue:
   github-connect: "GitHubアカウントに接続する"
   github-reconnect: "再接続する"
   github-disconnect: "切断する"
+  discord: "Discord連携"
+  discord-connect: "Discordアカウントに接続する"
+  discord-reconnect: "再接続する"
+  discord-disconnect: "切断する"
   update: "Misskey Update"
   version: "バージョン:"
   latest-version: "Neuste Version:"

locales/en-US.yml

@@ -16,7 +16,7 @@ common:
     reaction-desc: "Easiest way to tell your emotions. Misskey allows you to add various type of reactions to other’s post. The emotional experience on Misskey will never be on other SNSs which only able to push “likes”."
     ui: "Interface"
     ui-desc: "No UI fits for everyone. Therefore, Misskey has a highly customizable UI for your taste. Make your original home by editing, adjusting layouts of timeline and placing selectable widgets you can easily customize."
-    drive: "Misskey Drive"
+    drive: "Drive"
     drive-desc: "Wanna post a picture you have already uploaded? Wish to organize, name and create a folder for your uploaded files? Misskey Drive is the best solution for you. Very easy to share your files online."
     outro: "Check further Misskey-unique features on your eyes! Feeling like this is not for you, try other instances as Misskey is a decentralized SNS so that you can easily find your mates. Then, GLHF!"
   adblock:
@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
   destroy: "Discard the poll"
 common/views/components/reaction-picker.vue:
   choose-reaction: "Send a reaction"
+common/views/components/emoji-picker.vue:
+  custom-emoji: "Custom Emoji"
+  people: "People"
+  animals-and-nature: "Animals & Nature"
+  food-and-drink: "Food & drink"
+  activity: "Activity"
+  travel-and-places: "Travel & Places"
+  objects: "Objects"
+  symbols: "Symbols"
+  flags: "Flags"
 common/views/components/signin.vue:
   username: "Username"
   password: "Password"
@@ -353,6 +363,7 @@ common/views/components/signin.vue:
   or: "Or"
   signin-with-twitter: "Log in with Twitter"
   signin-with-github: "Log in with GitHub"
+  signin-with-discord: "Login 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"
@@ -396,7 +407,14 @@ common/views/components/github-setting.vue:
   connected-to: "You are connected to this GitHub account"
   detail: "More..."
   reconnect: "Reconnect"
-  connect: "Connect to GitHub"
+  connect: "Link your GitHub account"
+  disconnect: "Disconnect"
+common/views/components/discord-setting.vue:
+  description: "Once you connect your Discord account to your Misskey account, you will be able to see information about your Discord account on your profile, and you will be able to sign-in using Discord."
+  connected-to: "You are connected to this Discord account"
+  detail: "Details…"
+  reconnect: "Reconnect"
+  connect: "Link your Discord account"
   disconnect: "Disconnect"
 common/views/components/uploader.vue:
   waiting: "Waiting"
@@ -588,12 +606,6 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
   sensitive: "The content is NSFW"
   click-to-show: "Click to show"
-desktop/views/components/follow-button.vue:
-  following: "Following"
-  follow: "Follow"
-  request-pending: "Pending follow request"
-  follow-processing: "Processing follow"
-  follow-request: "Follow request"
 desktop/views/components/followers-window.vue:
   followers: "{}'s followers"
 desktop/views/components/followers.vue:
@@ -829,6 +841,10 @@ common/views/components/mute-and-block.vue:
   block: "Blocking"
   no-muted-users: "No muted users"
   no-blocked-users: "No blocked users"
+  word-mute: "Word mute"
+  muted-words: "Muted keywords"
+  muted-words-description: "Separating with spaces results in AND specifications, and delimiting with line breaks results in OR specifications"
+  save: "Save"
 common/views/components/password-settings.vue:
   reset: "Change password"
   enter-current-password: "Enter the current password"
@@ -903,6 +919,7 @@ admin/views/index.vue:
   dashboard: "Dashboard"
   instance: "Instance"
   emoji: "Emoji"
+  moderators: "Moderator"
   users: "Users"
   update: "Update"
   announcements: "Announcements"
@@ -947,7 +964,12 @@ admin/views/instance.vue:
   github-integration-info: "The callback URL is set on /api/gh/cb."
   enable-github-integration: "Enable connection to GitHub"
   github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
+  discord-integration-config: "Setting of Discord Integration"
+  discord-integration-info: "The callback URL is set on /api/dc/cb."
+  enable-discord-integration: "Enable Discord connection"
+  discord-integration-client-id: "Client ID"
+  discord-integration-client-secret: "Client Secret"
   proxy-account-config: "Proxy account"
   proxy-account-info: "Proxy account can follow a remote user to deliver activities if no one in this instance follow him or her. When you add a remote user who is followed by nobody in this instance to your list, in order to get his or her data, proxy account follow him or her instead of your following."
   proxy-account-username: "Proxy account user name"
@@ -997,6 +1019,11 @@ admin/views/users.vue:
   unverify-user: "User account unverification settings"
   unverify: "Unverify account"
   unverified: "The account is now being unverified"
+admin/views/moderators.vue:
+  add-moderator:
+    title: "Register Moderator"
+    add: "Register"
+    added: "Registered a Moderator."
 admin/views/emoji.vue:
   add-emoji:
     title: "Add emoji"
@@ -1161,11 +1188,11 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
   sensitive: "The content is NSFW"
   click-to-show: "Click to show"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
   following: "Following"
   follow: "Follow"
-  request-pending: "Pending follow request"
+  request-pending: "Pending"
-  follow-processing: "Processing follow"
+  follow-processing: "Processing"
   follow-request: "Follow request"
 mobile/views/components/friends-maker.vue:
   title: "Let's follow them"
@@ -1324,6 +1351,10 @@ mobile/views/pages/settings.vue:
   github-connect: "Connect to your GitHub account"
   github-reconnect: "Reconnect"
   github-disconnect: "Disconnect"
+  discord: "Discord Integration"
+  discord-connect: "Connect to your Discord account"
+  discord-reconnect: "Reconnect"
+  discord-disconnect: "Disconnect"
   update: "Misskey Update"
   version: "Current version:"
   latest-version: "Latest version:"

locales/es-ES.yml

@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
   destroy: "Cancelar la encuesta"
 common/views/components/reaction-picker.vue:
   choose-reaction: "Escoge una reacción"
+common/views/components/emoji-picker.vue:
+  custom-emoji: "カスタム絵文字"
+  people: "人"
+  animals-and-nature: "動物&自然"
+  food-and-drink: "食べ物&飲み物"
+  activity: "アクティビティ"
+  travel-and-places: "場所"
+  objects: "物"
+  symbols: "記号"
+  flags: "旗"
 common/views/components/signin.vue:
   username: "Usuario"
   password: "Contraseña"
@@ -353,6 +363,7 @@ common/views/components/signin.vue:
   or: "O"
   signin-with-twitter: "Ingresar con Twitter"
   signin-with-github: "GitHubでログイン"
+  signin-with-discord: "Discordでログイン"
   login-failed: "Autenticación fallida. Asegúrate de haber usado el nombre de usuario y contraseña correctos."
 common/views/components/signup.vue:
   invitation-code: "Código de invitación"
@@ -398,6 +409,13 @@ common/views/components/github-setting.vue:
   reconnect: "再接続する"
   connect: "GitHubと接続する"
   disconnect: "切断する"
+common/views/components/discord-setting.vue:
+  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
+  connected-to: "次のDiscordアカウントに接続されています"
+  detail: "詳細..."
+  reconnect: "再接続する"
+  connect: "Discordと接続する"
+  disconnect: "切断する"
 common/views/components/uploader.vue:
   waiting: "Un momento"
 common/views/components/visibility-chooser.vue:
@@ -588,12 +606,6 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
   sensitive: "Este contenido no es apropiado para ver en el trabajo"
   click-to-show: "Click para mostrar"
-desktop/views/components/follow-button.vue:
-  following: "Siguiendo"
-  follow: "Sigue"
-  request-pending: "Pendiente de aprobación"
-  follow-processing: "フォロー処理中"
-  follow-request: "Solicitud de seguir"
 desktop/views/components/followers-window.vue:
   followers: "{} seguidores"
 desktop/views/components/followers.vue:
@@ -829,6 +841,10 @@ common/views/components/mute-and-block.vue:
   block: "ブロック"
   no-muted-users: "ミュートしているユーザーはいません"
   no-blocked-users: "ブロックしているユーザーはいません"
+  word-mute: "ワードミュート"
+  muted-words: "ミュートされたキーワード"
+  muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
+  save: "保存"
 common/views/components/password-settings.vue:
   reset: "パスワードを変更する"
   enter-current-password: "現在のパスワードを入力してください"
@@ -903,6 +919,7 @@ admin/views/index.vue:
   dashboard: "ダッシュボード"
   instance: "インスタンス"
   emoji: "カスタム絵文字"
+  moderators: "モデレーター"
   users: "ユーザー"
   update: "更新"
   announcements: "お知らせ"
@@ -947,7 +964,12 @@ admin/views/instance.vue:
   github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
   enable-github-integration: "GitHub連携を有効にする"
   github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
+  discord-integration-config: "Discord連携の設定"
+  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  enable-discord-integration: "Discord連携を有効にする"
+  discord-integration-client-id: "Client ID"
+  discord-integration-client-secret: "Client Secret"
   proxy-account-config: "プロキシアカウントの設定"
   proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
   proxy-account-username: "プロキシアカウントのユーザー名"
@@ -997,6 +1019,11 @@ admin/views/users.vue:
   unverify-user: "ユーザーの公式アカウント解除"
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
+admin/views/moderators.vue:
+  add-moderator:
+    title: "モデレーターの登録"
+    add: "登録"
+    added: "モデレーターを登録しました"
 admin/views/emoji.vue:
   add-emoji:
     title: "絵文字の登録"
@@ -1161,7 +1188,7 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
   request-pending: "フォロー許可待ち"
@@ -1324,6 +1351,10 @@ mobile/views/pages/settings.vue:
   github-connect: "GitHubアカウントに接続する"
   github-reconnect: "再接続する"
   github-disconnect: "切断する"
+  discord: "Discord連携"
+  discord-connect: "Discordアカウントに接続する"
+  discord-reconnect: "再接続する"
+  discord-disconnect: "切断する"
   update: "Misskey Update"
   version: "バージョン:"
   latest-version: "最新のバージョン:"

locales/fr-FR.yml

@@ -71,7 +71,7 @@ common:
     friday: "Vendredi"
     saturday: "Samedi"
   reactions:
-    like: "J'aime"
+    like: "Bien"
     love: "Adore"
     laugh: "Rire"
     hmm: "Hmm … ?"
@@ -85,8 +85,8 @@ common:
     public: "Public"
     home: "Principal"
     home-desc: "Publier sur le fil principal uniquement"
-    followers: "Abonnés·es"
+    followers: "Abonné·e·s"
-    followers-desc: "Publier à vos abonnés·es uniquement"
+    followers-desc: "Publier à vos abonné·e·s uniquement"
     specified: "Direct"
     specified-desc: "Publier uniquement aux utilisateurs·rices mentionnés·es"
     private: "Privé"
@@ -99,7 +99,7 @@ common:
     f: "En attente de vos écrits"
   search: "Recherche"
   delete: "Supprimer"
-  loading: "Chargement"
+  loading: "Chargement en cours …"
   ok: "OK"
   update-available-title: "Mise à jour disponible"
   update-available: "Une nouvelle version de Misskey est disponible ({newer}, version actuelle: {current}). Veuillez recharger la page pour appliquer la mise à jour."
@@ -117,8 +117,8 @@ common:
   this-setting-is-this-device-only: "Uniquement sur cet appareil"
   use-os-default-emojis: "Utiliser les émojis standards du système"
   do-not-use-in-production: 'Il s’agit d’une version de développement. Ne pas utiliser dans un environnement de production.'
-  is-remote-user: "Ces informations utilisateur ont été copiées."
+  is-remote-user: "Ces informations appartiennent à un·e utilisateur·rice distant·e."
-  is-remote-post: "Ceci est une publication distante"
+  is-remote-post: "Ceci est une publication distante."
   view-on-remote: "Consulter le profil complet"
   error:
     title: 'Une erreur est survenue'
@@ -151,7 +151,7 @@ common:
     notifications: "Notifications"
     users: "Utilisateur·rice·s"
     polls: "Sondages"
-    post-form: "Formulaire de publication"
+    post-form: "Champs de publication"
     server: "Info sur le serveur"
     donation: "Dons"
     nav: "Navigation"
@@ -166,7 +166,7 @@ auth/views/form.vue:
   account-write: "Modifications des informations du compte :"
   note-write: "Publier."
   like-write: "Réagir aux publications."
-  following-write: "S'abonner et se désabonner."
+  following-write: "S’abonner et se désabonner."
   drive-read: "Lire votre Drive"
   drive-write: "Téléverser/supprimer des fichiers dans votre Drive."
   notification-read: "Lire vos notifications."
@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
   destroy: "Annuler ce sondage"
 common/views/components/reaction-picker.vue:
   choose-reaction: "Choisissez votre réaction"
+common/views/components/emoji-picker.vue:
+  custom-emoji: "Émoji personnalisé"
+  people: "Personnes"
+  animals-and-nature: "Animaux et nature"
+  food-and-drink: "Nourriture et boisson"
+  activity: "Activités"
+  travel-and-places: "Lieux et voyages"
+  objects: "Objets"
+  symbols: "Symboles"
+  flags: "Drapeaux"
 common/views/components/signin.vue:
   username: "Nom d'utilisateur·rice"
   password: "Mot de passe"
@@ -353,6 +363,7 @@ common/views/components/signin.vue:
   or: "Ou"
   signin-with-twitter: "Se connecter via Twitter"
   signin-with-github: "Se connecter avec GitHub"
+  signin-with-discord: "Discordでログイン"
   login-failed: "Échec d'authentification. Veuillez vérifier que votre nom d'utilisateur et mot de passe sont corrects."
 common/views/components/signup.vue:
   invitation-code: "Code d’invitation"
@@ -398,6 +409,13 @@ common/views/components/github-setting.vue:
   reconnect: "Reconnecter"
   connect: "Se connecter avec GitHub"
   disconnect: "Déconnecter"
+common/views/components/discord-setting.vue:
+  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
+  connected-to: "次のDiscordアカウントに接続されています"
+  detail: "詳細..."
+  reconnect: "再接続する"
+  connect: "Discordと接続する"
+  disconnect: "切断する"
 common/views/components/uploader.vue:
   waiting: "Veuillez patienter"
 common/views/components/visibility-chooser.vue:
@@ -490,9 +508,9 @@ common/views/pages/follow.vue:
   signed-in-as: "Connecté·e en tant que {}"
   following: "Suit"
   follow: "Suivre"
-  request-pending: "Demande d'abonnement en attente"
+  request-pending: "Demande d’abonnement en attente"
-  follow-processing: "En cours d’abonnement"
+  follow-processing: "Demande en attente"
-  follow-request: "Demande d'abonnement"
+  follow-request: "Demande d’abonnement"
 desktop:
   banner-crop-title: "Découpez la partie qui apparaitra comme bannière"
   banner: "Bannière"
@@ -588,16 +606,10 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
   sensitive: "Le contenu est NSFW"
   click-to-show: "Cliquer pour afficher"
-desktop/views/components/follow-button.vue:
-  following: "Abonné·e"
-  follow: "Suivre"
-  request-pending: "En attente d'approbation"
-  follow-processing: "Continuer l’abonnement"
-  follow-request: "Demande d'abonnement"
 desktop/views/components/followers-window.vue:
   followers: "{} abonné·e·s"
 desktop/views/components/followers.vue:
-  empty: "Il semble que vous n'avez pas encore d'abonné·e·s."
+  empty: "Il semble que vous n’avez pas encore d’abonné·e·s."
 desktop/views/components/following-window.vue:
   following: "Suit {}"
 desktop/views/components/following.vue:
@@ -640,7 +652,7 @@ desktop/views/components/notes.vue:
   error: "Échec du chargement."
   retry: "Réessayer"
 desktop/views/components/notifications.vue:
-  empty: "Pas de notifications"
+  empty: "Aucune de notification !"
 desktop/views/components/post-form.vue:
   add-visible-user: "+Ajouter un utilisateur"
   attach-location-information: "Attacher des informations de localisation"
@@ -829,6 +841,10 @@ common/views/components/mute-and-block.vue:
   block: "En cours blocage"
   no-muted-users: "Aucun utilisateur·rice n’est mis·e en sourdine"
   no-blocked-users: "Aucun utilisateur·rice n’est bloqué·e"
+  word-mute: "Filtre de mots"
+  muted-words: "Mots masqués"
+  muted-words-description: "Description des mots mis en sourdine"
+  save: "Enregistrer"
 common/views/components/password-settings.vue:
   reset: "Modifier le mot de passe"
   enter-current-password: "Entrez votre mot de passe actuel"
@@ -880,7 +896,7 @@ desktop/views/components/ui.header.search.vue:
   placeholder: "Chercher"
 desktop/views/components/received-follow-requests-window.vue:
   title: "Demandes de suivi"
-  accept: "Approuver"
+  accept: "Accepter"
   reject: "Refuser"
 desktop/views/components/user-lists-window.vue:
   title: "Listes de l'utilisateur"
@@ -903,6 +919,7 @@ admin/views/index.vue:
   dashboard: "Tableau de bord"
   instance: "Instance"
   emoji: "Emoji"
+  moderators: "モデレーター"
   users: "Utilisateur·rice·s"
   update: "Mise à jour"
   announcements: "Annonces"
@@ -947,7 +964,12 @@ admin/views/instance.vue:
   github-integration-info: "L’URL callback est définit sur /api/gh/cb"
   enable-github-integration: "Activer l’authentification avec Github"
   github-integration-client-id: "ID client"
-  github-integration-client-secret: "Secret client"
+  github-integration-client-secret: "Client Secret"
+  discord-integration-config: "Discord連携の設定"
+  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  enable-discord-integration: "Discord連携を有効にする"
+  discord-integration-client-id: "Client ID"
+  discord-integration-client-secret: "Client Secret"
   proxy-account-config: "Compte proxy"
   proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
   proxy-account-username: "Nom d’utilisateur du compte proxy"
@@ -997,6 +1019,11 @@ admin/views/users.vue:
   unverify-user: "ユーザーの公式アカウント解除"
   unverify: "Ôter la vérification du compte"
   unverified: "Ce compte n'est plus vérifié"
+admin/views/moderators.vue:
+  add-moderator:
+    title: "モデレーターの登録"
+    add: "登録"
+    added: "モデレーターを登録しました"
 admin/views/emoji.vue:
   add-emoji:
     title: "Ajouter un émoji"
@@ -1067,7 +1094,7 @@ desktop/views/pages/user-list.users.vue:
 desktop/views/pages/user/user.followers-you-know.vue:
   title: "Abonné·e·s que vous connaissez"
   loading: "Chargement en cours"
-  no-users: "Pas d'utilisateurs"
+  no-users: "Aucun abonné connu"
 desktop/views/pages/user/user.friends.vue:
   title: "Mentions fréquentes"
   loading: "Chargement en cours"
@@ -1079,8 +1106,8 @@ desktop/views/pages/user/user.photos.vue:
 desktop/views/pages/user/user.profile.vue:
   follows-you: "Vous suit"
   stalk: "Traquer"
-  stalking: "ストーキングしています"
+  stalking: "Entrain de poursuivre"
-  unstalk: "ストーク解除"
+  unstalk: "Cesser la poursuite"
   mute: "Mettre en sourdine"
   muted: "Muting"
   unmute: "Enlever la sourdine"
@@ -1161,12 +1188,12 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
   sensitive: "Le contenu est NSFW"
   click-to-show: "Cliquer pour afficher"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
   following: "Abonné·e"
-  follow: "Suivre"
+  follow: " Suivre"
-  request-pending: "En attente d'approbation"
+  request-pending: "Demande en attente"
   follow-processing: "En cours d’abonnement"
-  follow-request: "Demande d'abonnement"
+  follow-request: "Demande d’abonnement"
 mobile/views/components/friends-maker.vue:
   title: "Abonnez-vous aux utilisateurs"
   empty: "Impossible de trouver des utilisateurs·trices à recommander."
@@ -1194,7 +1221,7 @@ mobile/views/components/note-sub.vue:
   bot: "bot"
   cat: "chat"
 mobile/views/components/notifications.vue:
-  empty: "Pas de notifications"
+  empty: "Aucune de notification !"
 mobile/views/components/post-form.vue:
   add-visible-user: "Ajouter un utilisateur"
   submit: "Publier"
@@ -1219,7 +1246,7 @@ mobile/views/components/ui.header.vue:
 mobile/views/components/ui.nav.vue:
   timeline: "Fil d'actualité"
   notifications: "Notifications"
-  follow-requests: "Demandes d'abonnement"
+  follow-requests: "Demandes d’abonnement"
   search: "Rechercher"
   favorites: "Favoris"
   user-lists: "Listes"
@@ -1267,8 +1294,8 @@ mobile/views/pages/widgets/activity.vue:
 mobile/views/pages/share.vue:
   share-with: "Partager avec {name}"
 mobile/views/pages/received-follow-requests.vue:
-  title: "Demandes d'abonnement"
+  title: "Demandes d’abonnement"
-  accept: "Approuver"
+  accept: "Accepter"
   reject: "Refuser"
 mobile/views/pages/note.vue:
   title: "Post"
@@ -1276,7 +1303,7 @@ mobile/views/pages/note.vue:
   next: "Note suivante"
 mobile/views/pages/notifications.vue:
   notifications: "Notifications"
-  read-all: "Êtes vous sûr de vouloir marqués toutes les notifications non-lus en tant que lus?"
+  read-all: "Êtes-vous sûr de vouloir marquer l’ensemble des notifications comme étant lues ?"
 mobile/views/pages/games/reversi.vue:
   reversi: "Reversi"
 mobile/views/pages/search.vue:
@@ -1324,6 +1351,10 @@ mobile/views/pages/settings.vue:
   github-connect: "Se connecter à votre compte GitHub"
   github-reconnect: "Reconnecter"
   github-disconnect: "Déconnecter"
+  discord: "Discord連携"
+  discord-connect: "Discordアカウントに接続する"
+  discord-reconnect: "再接続する"
+  discord-disconnect: "切断する"
   update: "Mise à jour de Misskey"
   version: "Version :"
   latest-version: "Dernière version :"
@@ -1363,7 +1394,7 @@ mobile/views/pages/user/home.vue:
   followers-you-know: "Abonné·e·s que vous connaissez"
   last-used-at: "Dernière connexion il y a"
 mobile/views/pages/user/home.followers-you-know.vue:
-  no-users: "Pas d'utilisateurs"
+  no-users: "Aucun utilisateur·rice connu·e"
 mobile/views/pages/user/home.friends.vue:
   no-users: "Pass d'utilisateurs"
 mobile/views/pages/user/home.notes.vue:

locales/it-IT.yml

@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
   destroy: "アンケートを破棄"
 common/views/components/reaction-picker.vue:
   choose-reaction: "リアクションを選択"
+common/views/components/emoji-picker.vue:
+  custom-emoji: "カスタム絵文字"
+  people: "人"
+  animals-and-nature: "動物&自然"
+  food-and-drink: "食べ物&飲み物"
+  activity: "アクティビティ"
+  travel-and-places: "場所"
+  objects: "物"
+  symbols: "記号"
+  flags: "旗"
 common/views/components/signin.vue:
   username: "ユーザー名"
   password: "パスワード"
@@ -353,6 +363,7 @@ common/views/components/signin.vue:
   or: "または"
   signin-with-twitter: "Twitterでログイン"
   signin-with-github: "GitHubでログイン"
+  signin-with-discord: "Discordでログイン"
   login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
   invitation-code: "招待コード"
@@ -398,6 +409,13 @@ common/views/components/github-setting.vue:
   reconnect: "再接続する"
   connect: "GitHubと接続する"
   disconnect: "切断する"
+common/views/components/discord-setting.vue:
+  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
+  connected-to: "次のDiscordアカウントに接続されています"
+  detail: "詳細..."
+  reconnect: "再接続する"
+  connect: "Discordと接続する"
+  disconnect: "切断する"
 common/views/components/uploader.vue:
   waiting: "待機中"
 common/views/components/visibility-chooser.vue:
@@ -588,12 +606,6 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
-desktop/views/components/follow-button.vue:
-  following: "フォロー中"
-  follow: "フォロー"
-  request-pending: "フォロー許可待ち"
-  follow-processing: "フォロー処理中"
-  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
   followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -829,6 +841,10 @@ common/views/components/mute-and-block.vue:
   block: "ブロック"
   no-muted-users: "ミュートしているユーザーはいません"
   no-blocked-users: "ブロックしているユーザーはいません"
+  word-mute: "ワードミュート"
+  muted-words: "ミュートされたキーワード"
+  muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
+  save: "保存"
 common/views/components/password-settings.vue:
   reset: "パスワードを変更する"
   enter-current-password: "現在のパスワードを入力してください"
@@ -903,6 +919,7 @@ admin/views/index.vue:
   dashboard: "ダッシュボード"
   instance: "インスタンス"
   emoji: "カスタム絵文字"
+  moderators: "モデレーター"
   users: "ユーザー"
   update: "更新"
   announcements: "お知らせ"
@@ -947,7 +964,12 @@ admin/views/instance.vue:
   github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
   enable-github-integration: "GitHub連携を有効にする"
   github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
+  discord-integration-config: "Discord連携の設定"
+  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  enable-discord-integration: "Discord連携を有効にする"
+  discord-integration-client-id: "Client ID"
+  discord-integration-client-secret: "Client Secret"
   proxy-account-config: "プロキシアカウントの設定"
   proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
   proxy-account-username: "プロキシアカウントのユーザー名"
@@ -997,6 +1019,11 @@ admin/views/users.vue:
   unverify-user: "ユーザーの公式アカウント解除"
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
+admin/views/moderators.vue:
+  add-moderator:
+    title: "モデレーターの登録"
+    add: "登録"
+    added: "モデレーターを登録しました"
 admin/views/emoji.vue:
   add-emoji:
     title: "絵文字の登録"
@@ -1161,7 +1188,7 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
   request-pending: "フォロー許可待ち"
@@ -1324,6 +1351,10 @@ mobile/views/pages/settings.vue:
   github-connect: "GitHubアカウントに接続する"
   github-reconnect: "再接続する"
   github-disconnect: "切断する"
+  discord: "Discord連携"
+  discord-connect: "Discordアカウントに接続する"
+  discord-reconnect: "再接続する"
+  discord-disconnect: "切断する"
   update: "Misskey Update"
   version: "バージョン:"
   latest-version: "最新のバージョン:"

locales/ja-JP.yml

@@ -399,6 +399,7 @@ common/views/components/signin.vue:
   or: "または"
   signin-with-twitter: "Twitterでログイン"
   signin-with-github: "GitHubでログイン"
+  signin-with-discord: "Discordでログイン"
   login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 
 common/views/components/signup.vue:
@@ -450,6 +451,14 @@ common/views/components/github-setting.vue:
   connect: "GitHubと接続する"
   disconnect: "切断する"
 
+common/views/components/discord-setting.vue:
+  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
+  connected-to: "次のDiscordアカウントに接続されています"
+  detail: "詳細..."
+  reconnect: "再接続する"
+  connect: "Discordと接続する"
+  disconnect: "切断する"
+
 common/views/components/uploader.vue:
   waiting: "待機中"
 
@@ -1034,6 +1043,7 @@ admin/views/index.vue:
   dashboard: "ダッシュボード"
   instance: "インスタンス"
   emoji: "カスタム絵文字"
+  moderators: "モデレーター"
   users: "ユーザー"
   update: "更新"
   announcements: "お知らせ"
@@ -1080,7 +1090,12 @@ admin/views/instance.vue:
   github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
   enable-github-integration: "GitHub連携を有効にする"
   github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
+  discord-integration-config: "Discord連携の設定"
+  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  enable-discord-integration: "Discord連携を有効にする"
+  discord-integration-client-id: "Client ID"
+  discord-integration-client-secret: "Client Secret"
   proxy-account-config: "プロキシアカウントの設定"
   proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
   proxy-account-username: "プロキシアカウントのユーザー名"
@@ -1133,6 +1148,12 @@ admin/views/users.vue:
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
 
+admin/views/moderators.vue:
+  add-moderator:
+    title: "モデレーターの登録"
+    add: "登録"
+    added: "モデレーターを登録しました"
+
 admin/views/emoji.vue:
   add-emoji:
     title: "絵文字の登録"
@@ -1523,6 +1544,10 @@ mobile/views/pages/settings.vue:
   github-connect: "GitHubアカウントに接続する"
   github-reconnect: "再接続する"
   github-disconnect: "切断する"
+  discord: "Discord連携"
+  discord-connect: "Discordアカウントに接続する"
+  discord-reconnect: "再接続する"
+  discord-disconnect: "切断する"
   update: "Misskey Update"
   version: "バージョン:"
   latest-version: "最新のバージョン:"

locales/ja-KS.yml

@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
   destroy: "アンケートをほかそ"
 common/views/components/reaction-picker.vue:
   choose-reaction: "リアクション、どれにするんや？"
+common/views/components/emoji-picker.vue:
+  custom-emoji: "カスタム絵文字"
+  people: "人"
+  animals-and-nature: "動物&自然"
+  food-and-drink: "食べ物&飲み物"
+  activity: "アクティビティ"
+  travel-and-places: "場所"
+  objects: "物"
+  symbols: "記号"
+  flags: "旗"
 common/views/components/signin.vue:
   username: "ユーザー名"
   password: "パスワード"
@@ -353,6 +363,7 @@ common/views/components/signin.vue:
   or: "それか"
   signin-with-twitter: "Twitterでサインイン"
   signin-with-github: "GitHubでログイン"
+  signin-with-discord: "Discordでログイン"
   login-failed: "なんかログインできんかったわ。ユーザー名とパスワードとかを確認してや。"
 common/views/components/signup.vue:
   invitation-code: "招待コード"
@@ -398,6 +409,13 @@ common/views/components/github-setting.vue:
   reconnect: "再接続する"
   connect: "GitHubと接続する"
   disconnect: "切断する"
+common/views/components/discord-setting.vue:
+  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
+  connected-to: "次のDiscordアカウントに接続されています"
+  detail: "詳細..."
+  reconnect: "再接続する"
+  connect: "Discordと接続する"
+  disconnect: "切断する"
 common/views/components/uploader.vue:
   waiting: "待っとる"
 common/views/components/visibility-chooser.vue:
@@ -588,12 +606,6 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
   sensitive: "ちょっと見せられへんわ"
   click-to-show: "クリックして見せるで"
-desktop/views/components/follow-button.vue:
-  following: "フォローしとる"
-  follow: "フォロー"
-  request-pending: "フォローの許し待っとる"
-  follow-processing: "今フォロー処理やっとる‥"
-  follow-request: "フォロー許してくれや！言うてみる"
 desktop/views/components/followers-window.vue:
   followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -829,6 +841,10 @@ common/views/components/mute-and-block.vue:
   block: "ブロック"
   no-muted-users: "ミュートしとるユーザーはおらんで"
   no-blocked-users: "ブロックしとるユーザーはおらんで"
+  word-mute: "ワードミュート"
+  muted-words: "ミュートされたキーワード"
+  muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
+  save: "保存"
 common/views/components/password-settings.vue:
   reset: "パスワード変える"
   enter-current-password: "今のパスワードを入れてや"
@@ -903,6 +919,7 @@ admin/views/index.vue:
   dashboard: "ダッシュボード"
   instance: "インスタンス"
   emoji: "カスタム絵文字"
+  moderators: "モデレーター"
   users: "ユーザー"
   update: "更新"
   announcements: "知っといてや"
@@ -947,7 +964,12 @@ admin/views/instance.vue:
   github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
   enable-github-integration: "GitHub連携を有効にする"
   github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
+  discord-integration-config: "Discord連携の設定"
+  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  enable-discord-integration: "Discord連携を有効にする"
+  discord-integration-client-id: "Client ID"
+  discord-integration-client-secret: "Client Secret"
   proxy-account-config: "プロキシアカウントの設定"
   proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
   proxy-account-username: "プロキシアカウントのユーザー名"
@@ -997,6 +1019,11 @@ admin/views/users.vue:
   unverify-user: "ユーザーの公式アカウント解除"
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
+admin/views/moderators.vue:
+  add-moderator:
+    title: "モデレーターの登録"
+    add: "登録"
+    added: "モデレーターを登録しました"
 admin/views/emoji.vue:
   add-emoji:
     title: "絵文字の登録"
@@ -1161,12 +1188,12 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
   sensitive: "ちょっと見せられへんわ"
   click-to-show: "押してみ、見せたるわ"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
-  following: "フォローしとる"
+  following: "フォロー中"
   follow: "フォロー"
-  request-pending: "フォローの許し待っとる"
+  request-pending: "フォロー許可待ち"
-  follow-processing: "今フォロー処理やっとる‥"
+  follow-processing: "フォロー処理中"
-  follow-request: "フォロー許してくれや！言うてみる"
+  follow-request: "フォロー申請"
 mobile/views/components/friends-maker.vue:
   title: "おもろそうやな"
   empty: "おすすめのユーザーはおらん。"
@@ -1324,6 +1351,10 @@ mobile/views/pages/settings.vue:
   github-connect: "GitHubアカウントに接続する"
   github-reconnect: "再接続する"
   github-disconnect: "切断する"
+  discord: "Discord連携"
+  discord-connect: "Discordアカウントに接続する"
+  discord-reconnect: "再接続する"
+  discord-disconnect: "切断する"
   update: "あんたのMisskeyいつのや？"
   version: "バージョン:"
   latest-version: "いっちゃん新しいやつ:"

locales/ko-KR.yml

@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
   destroy: "アンケートを破棄"
 common/views/components/reaction-picker.vue:
   choose-reaction: "リアクションを選択"
+common/views/components/emoji-picker.vue:
+  custom-emoji: "カスタム絵文字"
+  people: "人"
+  animals-and-nature: "動物&自然"
+  food-and-drink: "食べ物&飲み物"
+  activity: "アクティビティ"
+  travel-and-places: "場所"
+  objects: "物"
+  symbols: "記号"
+  flags: "旗"
 common/views/components/signin.vue:
   username: "ユーザー名"
   password: "パスワード"
@@ -353,6 +363,7 @@ common/views/components/signin.vue:
   or: "または"
   signin-with-twitter: "Twitterでログイン"
   signin-with-github: "GitHubでログイン"
+  signin-with-discord: "Discordでログイン"
   login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
   invitation-code: "招待コード"
@@ -398,6 +409,13 @@ common/views/components/github-setting.vue:
   reconnect: "再接続する"
   connect: "GitHubと接続する"
   disconnect: "切断する"
+common/views/components/discord-setting.vue:
+  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
+  connected-to: "次のDiscordアカウントに接続されています"
+  detail: "詳細..."
+  reconnect: "再接続する"
+  connect: "Discordと接続する"
+  disconnect: "切断する"
 common/views/components/uploader.vue:
   waiting: "待機中"
 common/views/components/visibility-chooser.vue:
@@ -588,12 +606,6 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
-desktop/views/components/follow-button.vue:
-  following: "フォロー中"
-  follow: "フォロー"
-  request-pending: "フォロー許可待ち"
-  follow-processing: "フォロー処理中"
-  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
   followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -829,6 +841,10 @@ common/views/components/mute-and-block.vue:
   block: "ブロック"
   no-muted-users: "ミュートしているユーザーはいません"
   no-blocked-users: "ブロックしているユーザーはいません"
+  word-mute: "ワードミュート"
+  muted-words: "ミュートされたキーワード"
+  muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
+  save: "保存"
 common/views/components/password-settings.vue:
   reset: "パスワードを変更する"
   enter-current-password: "現在のパスワードを入力してください"
@@ -903,6 +919,7 @@ admin/views/index.vue:
   dashboard: "ダッシュボード"
   instance: "インスタンス"
   emoji: "カスタム絵文字"
+  moderators: "モデレーター"
   users: "ユーザー"
   update: "更新"
   announcements: "お知らせ"
@@ -947,7 +964,12 @@ admin/views/instance.vue:
   github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
   enable-github-integration: "GitHub連携を有効にする"
   github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
+  discord-integration-config: "Discord連携の設定"
+  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  enable-discord-integration: "Discord連携を有効にする"
+  discord-integration-client-id: "Client ID"
+  discord-integration-client-secret: "Client Secret"
   proxy-account-config: "プロキシアカウントの設定"
   proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
   proxy-account-username: "プロキシアカウントのユーザー名"
@@ -997,6 +1019,11 @@ admin/views/users.vue:
   unverify-user: "ユーザーの公式アカウント解除"
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
+admin/views/moderators.vue:
+  add-moderator:
+    title: "モデレーターの登録"
+    add: "登録"
+    added: "モデレーターを登録しました"
 admin/views/emoji.vue:
   add-emoji:
     title: "絵文字の登録"
@@ -1161,7 +1188,7 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
   request-pending: "フォロー許可待ち"
@@ -1324,6 +1351,10 @@ mobile/views/pages/settings.vue:
   github-connect: "GitHubアカウントに接続する"
   github-reconnect: "再接続する"
   github-disconnect: "切断する"
+  discord: "Discord連携"
+  discord-connect: "Discordアカウントに接続する"
+  discord-reconnect: "再接続する"
+  discord-disconnect: "切断する"
   update: "Misskey Update"
   version: "バージョン:"
   latest-version: "最新のバージョン:"

locales/nl-NL.yml

@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
   destroy: "Deze peiling vernietigen"
 common/views/components/reaction-picker.vue:
   choose-reaction: "Kies een reactie"
+common/views/components/emoji-picker.vue:
+  custom-emoji: "カスタム絵文字"
+  people: "人"
+  animals-and-nature: "動物&自然"
+  food-and-drink: "食べ物&飲み物"
+  activity: "アクティビティ"
+  travel-and-places: "場所"
+  objects: "物"
+  symbols: "記号"
+  flags: "旗"
 common/views/components/signin.vue:
   username: "Gebruikersnaam"
   password: "Wachtwoord"
@@ -353,6 +363,7 @@ common/views/components/signin.vue:
   or: "または"
   signin-with-twitter: "Twitterでログイン"
   signin-with-github: "GitHubでログイン"
+  signin-with-discord: "Discordでログイン"
   login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
   invitation-code: "招待コード"
@@ -398,6 +409,13 @@ common/views/components/github-setting.vue:
   reconnect: "再接続する"
   connect: "GitHubと接続する"
   disconnect: "切断する"
+common/views/components/discord-setting.vue:
+  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
+  connected-to: "次のDiscordアカウントに接続されています"
+  detail: "詳細..."
+  reconnect: "再接続する"
+  connect: "Discordと接続する"
+  disconnect: "切断する"
 common/views/components/uploader.vue:
   waiting: "Bezig met wachten"
 common/views/components/visibility-chooser.vue:
@@ -588,12 +606,6 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
-desktop/views/components/follow-button.vue:
-  following: "フォロー中"
-  follow: "Volgen"
-  request-pending: "フォロー許可待ち"
-  follow-processing: "フォロー処理中"
-  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
   followers: "Volgers van {}"
 desktop/views/components/followers.vue:
@@ -829,6 +841,10 @@ common/views/components/mute-and-block.vue:
   block: "ブロック"
   no-muted-users: "ミュートしているユーザーはいません"
   no-blocked-users: "ブロックしているユーザーはいません"
+  word-mute: "ワードミュート"
+  muted-words: "ミュートされたキーワード"
+  muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
+  save: "保存"
 common/views/components/password-settings.vue:
   reset: "パスワードを変更する"
   enter-current-password: "現在のパスワードを入力してください"
@@ -903,6 +919,7 @@ admin/views/index.vue:
   dashboard: "ダッシュボード"
   instance: "インスタンス"
   emoji: "カスタム絵文字"
+  moderators: "モデレーター"
   users: "ユーザー"
   update: "更新"
   announcements: "お知らせ"
@@ -947,7 +964,12 @@ admin/views/instance.vue:
   github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
   enable-github-integration: "GitHub連携を有効にする"
   github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
+  discord-integration-config: "Discord連携の設定"
+  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  enable-discord-integration: "Discord連携を有効にする"
+  discord-integration-client-id: "Client ID"
+  discord-integration-client-secret: "Client Secret"
   proxy-account-config: "プロキシアカウントの設定"
   proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
   proxy-account-username: "プロキシアカウントのユーザー名"
@@ -997,6 +1019,11 @@ admin/views/users.vue:
   unverify-user: "ユーザーの公式アカウント解除"
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
+admin/views/moderators.vue:
+  add-moderator:
+    title: "モデレーターの登録"
+    add: "登録"
+    added: "モデレーターを登録しました"
 admin/views/emoji.vue:
   add-emoji:
     title: "絵文字の登録"
@@ -1161,9 +1188,9 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
   following: "フォロー中"
-  follow: "Volgen"
+  follow: "フォロー"
   request-pending: "フォロー許可待ち"
   follow-processing: "フォロー処理中"
   follow-request: "フォロー申請"
@@ -1324,6 +1351,10 @@ mobile/views/pages/settings.vue:
   github-connect: "GitHubアカウントに接続する"
   github-reconnect: "再接続する"
   github-disconnect: "切断する"
+  discord: "Discord連携"
+  discord-connect: "Discordアカウントに接続する"
+  discord-reconnect: "再接続する"
+  discord-disconnect: "切断する"
   update: "Misskey-update"
   version: "Huidige versie:"
   latest-version: "Nieuwste versie:"

locales/no-NO.yml

@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
   destroy: "アンケートを破棄"
 common/views/components/reaction-picker.vue:
   choose-reaction: "リアクションを選択"
+common/views/components/emoji-picker.vue:
+  custom-emoji: "カスタム絵文字"
+  people: "人"
+  animals-and-nature: "動物&自然"
+  food-and-drink: "食べ物&飲み物"
+  activity: "アクティビティ"
+  travel-and-places: "場所"
+  objects: "物"
+  symbols: "記号"
+  flags: "旗"
 common/views/components/signin.vue:
   username: "Brukernavn"
   password: "Passord"
@@ -353,6 +363,7 @@ common/views/components/signin.vue:
   or: "Eller"
   signin-with-twitter: "Twitterでログイン"
   signin-with-github: "GitHubでログイン"
+  signin-with-discord: "Discordでログイン"
   login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
   invitation-code: "招待コード"
@@ -398,6 +409,13 @@ common/views/components/github-setting.vue:
   reconnect: "再接続する"
   connect: "GitHubと接続する"
   disconnect: "切断する"
+common/views/components/discord-setting.vue:
+  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
+  connected-to: "次のDiscordアカウントに接続されています"
+  detail: "詳細..."
+  reconnect: "再接続する"
+  connect: "Discordと接続する"
+  disconnect: "切断する"
 common/views/components/uploader.vue:
   waiting: "Venter"
 common/views/components/visibility-chooser.vue:
@@ -588,12 +606,6 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
   sensitive: "Innholdet er NSFW"
   click-to-show: "クリックして表示"
-desktop/views/components/follow-button.vue:
-  following: "Følger"
-  follow: "Følg"
-  request-pending: "フォロー許可待ち"
-  follow-processing: "フォロー処理中"
-  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
   followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -829,6 +841,10 @@ common/views/components/mute-and-block.vue:
   block: "ブロック"
   no-muted-users: "ミュートしているユーザーはいません"
   no-blocked-users: "ブロックしているユーザーはいません"
+  word-mute: "ワードミュート"
+  muted-words: "ミュートされたキーワード"
+  muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
+  save: "保存"
 common/views/components/password-settings.vue:
   reset: "パスワードを変更する"
   enter-current-password: "現在のパスワードを入力してください"
@@ -903,6 +919,7 @@ admin/views/index.vue:
   dashboard: "ダッシュボード"
   instance: "インスタンス"
   emoji: "カスタム絵文字"
+  moderators: "モデレーター"
   users: "ユーザー"
   update: "更新"
   announcements: "お知らせ"
@@ -947,7 +964,12 @@ admin/views/instance.vue:
   github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
   enable-github-integration: "GitHub連携を有効にする"
   github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
+  discord-integration-config: "Discord連携の設定"
+  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  enable-discord-integration: "Discord連携を有効にする"
+  discord-integration-client-id: "Client ID"
+  discord-integration-client-secret: "Client Secret"
   proxy-account-config: "プロキシアカウントの設定"
   proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
   proxy-account-username: "プロキシアカウントのユーザー名"
@@ -997,6 +1019,11 @@ admin/views/users.vue:
   unverify-user: "ユーザーの公式アカウント解除"
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
+admin/views/moderators.vue:
+  add-moderator:
+    title: "モデレーターの登録"
+    add: "登録"
+    added: "モデレーターを登録しました"
 admin/views/emoji.vue:
   add-emoji:
     title: "絵文字の登録"
@@ -1161,9 +1188,9 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
   sensitive: "Innholdet er NSFW"
   click-to-show: "クリックして表示"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
-  following: "Følger"
+  following: "フォロー中"
-  follow: "Følg"
+  follow: "フォロー"
   request-pending: "フォロー許可待ち"
   follow-processing: "フォロー処理中"
   follow-request: "フォロー申請"
@@ -1324,6 +1351,10 @@ mobile/views/pages/settings.vue:
   github-connect: "GitHubアカウントに接続する"
   github-reconnect: "再接続する"
   github-disconnect: "切断する"
+  discord: "Discord連携"
+  discord-connect: "Discordアカウントに接続する"
+  discord-reconnect: "再接続する"
+  discord-disconnect: "切断する"
   update: "Misskey Update"
   version: "バージョン:"
   latest-version: "最新のバージョン:"

locales/pl-PL.yml

@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
   destroy: "Usuń tę ankietę"
 common/views/components/reaction-picker.vue:
   choose-reaction: "Wybierz reakcję"
+common/views/components/emoji-picker.vue:
+  custom-emoji: "カスタム絵文字"
+  people: "人"
+  animals-and-nature: "動物&自然"
+  food-and-drink: "食べ物&飲み物"
+  activity: "アクティビティ"
+  travel-and-places: "場所"
+  objects: "物"
+  symbols: "記号"
+  flags: "旗"
 common/views/components/signin.vue:
   username: "Nazwa użytkownika"
   password: "Hasło"
@@ -353,6 +363,7 @@ common/views/components/signin.vue:
   or: "または"
   signin-with-twitter: "Zaloguj się za pomocą Twittera"
   signin-with-github: "GitHubでログイン"
+  signin-with-discord: "Discordでログイン"
   login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
   invitation-code: "招待コード"
@@ -398,6 +409,13 @@ common/views/components/github-setting.vue:
   reconnect: "再接続する"
   connect: "GitHubと接続する"
   disconnect: "切断する"
+common/views/components/discord-setting.vue:
+  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
+  connected-to: "次のDiscordアカウントに接続されています"
+  detail: "詳細..."
+  reconnect: "再接続する"
+  connect: "Discordと接続する"
+  disconnect: "切断する"
 common/views/components/uploader.vue:
   waiting: "Oczekiwanie"
 common/views/components/visibility-chooser.vue:
@@ -588,12 +606,6 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
   sensitive: "To jest zawartość NSFW"
   click-to-show: "Naciśnij aby wyświetlić"
-desktop/views/components/follow-button.vue:
-  following: "Śledzisz"
-  follow: "Śledź"
-  request-pending: "Oczekiwanie na pozwolenie"
-  follow-processing: "フォロー処理中"
-  follow-request: "Poproś o śledzenie"
 desktop/views/components/followers-window.vue:
   followers: "Śledzący"
 desktop/views/components/followers.vue:
@@ -829,6 +841,10 @@ common/views/components/mute-and-block.vue:
   block: "ブロック"
   no-muted-users: "ミュートしているユーザーはいません"
   no-blocked-users: "ブロックしているユーザーはいません"
+  word-mute: "ワードミュート"
+  muted-words: "ミュートされたキーワード"
+  muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
+  save: "保存"
 common/views/components/password-settings.vue:
   reset: "パスワードを変更する"
   enter-current-password: "現在のパスワードを入力してください"
@@ -903,6 +919,7 @@ admin/views/index.vue:
   dashboard: "ダッシュボード"
   instance: "インスタンス"
   emoji: "カスタム絵文字"
+  moderators: "モデレーター"
   users: "ユーザー"
   update: "更新"
   announcements: "お知らせ"
@@ -947,7 +964,12 @@ admin/views/instance.vue:
   github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
   enable-github-integration: "GitHub連携を有効にする"
   github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
+  discord-integration-config: "Discord連携の設定"
+  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  enable-discord-integration: "Discord連携を有効にする"
+  discord-integration-client-id: "Client ID"
+  discord-integration-client-secret: "Client Secret"
   proxy-account-config: "プロキシアカウントの設定"
   proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
   proxy-account-username: "プロキシアカウントのユーザー名"
@@ -997,6 +1019,11 @@ admin/views/users.vue:
   unverify-user: "ユーザーの公式アカウント解除"
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
+admin/views/moderators.vue:
+  add-moderator:
+    title: "モデレーターの登録"
+    add: "登録"
+    added: "モデレーターを登録しました"
 admin/views/emoji.vue:
   add-emoji:
     title: "絵文字の登録"
@@ -1161,12 +1188,12 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
   sensitive: "To jest zawartość NSFW"
   click-to-show: "Naciśnij aby wyświetlić"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
-  following: "Śledzisz"
+  following: "フォロー中"
-  follow: "Śledź"
+  follow: "フォロー"
-  request-pending: "Oczekiwanie na pozwolenie"
+  request-pending: "フォロー許可待ち"
   follow-processing: "フォロー処理中"
-  follow-request: "Poproś o śledzenie"
+  follow-request: "フォロー申請"
 mobile/views/components/friends-maker.vue:
   title: "Zacznij śledzić ludzi takich jak Ty"
   empty: "Nie znaleziono podobnych użytkowników."
@@ -1324,6 +1351,10 @@ mobile/views/pages/settings.vue:
   github-connect: "GitHubアカウントに接続する"
   github-reconnect: "再接続する"
   github-disconnect: "切断する"
+  discord: "Discord連携"
+  discord-connect: "Discordアカウントに接続する"
+  discord-reconnect: "再接続する"
+  discord-disconnect: "切断する"
   update: "Aktualizacja Misskey"
   version: "Wersja:"
   latest-version: "Najnowsza wersja:"

locales/pt-PT.yml

@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
   destroy: "アンケートを破棄"
 common/views/components/reaction-picker.vue:
   choose-reaction: "リアクションを選択"
+common/views/components/emoji-picker.vue:
+  custom-emoji: "カスタム絵文字"
+  people: "人"
+  animals-and-nature: "動物&自然"
+  food-and-drink: "食べ物&飲み物"
+  activity: "アクティビティ"
+  travel-and-places: "場所"
+  objects: "物"
+  symbols: "記号"
+  flags: "旗"
 common/views/components/signin.vue:
   username: "ユーザー名"
   password: "パスワード"
@@ -353,6 +363,7 @@ common/views/components/signin.vue:
   or: "または"
   signin-with-twitter: "Twitterでログイン"
   signin-with-github: "GitHubでログイン"
+  signin-with-discord: "Discordでログイン"
   login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
   invitation-code: "招待コード"
@@ -398,6 +409,13 @@ common/views/components/github-setting.vue:
   reconnect: "再接続する"
   connect: "GitHubと接続する"
   disconnect: "切断する"
+common/views/components/discord-setting.vue:
+  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
+  connected-to: "次のDiscordアカウントに接続されています"
+  detail: "詳細..."
+  reconnect: "再接続する"
+  connect: "Discordと接続する"
+  disconnect: "切断する"
 common/views/components/uploader.vue:
   waiting: "待機中"
 common/views/components/visibility-chooser.vue:
@@ -588,12 +606,6 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
-desktop/views/components/follow-button.vue:
-  following: "フォロー中"
-  follow: "フォロー"
-  request-pending: "フォロー許可待ち"
-  follow-processing: "フォロー処理中"
-  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
   followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -829,6 +841,10 @@ common/views/components/mute-and-block.vue:
   block: "ブロック"
   no-muted-users: "ミュートしているユーザーはいません"
   no-blocked-users: "ブロックしているユーザーはいません"
+  word-mute: "ワードミュート"
+  muted-words: "ミュートされたキーワード"
+  muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
+  save: "保存"
 common/views/components/password-settings.vue:
   reset: "パスワードを変更する"
   enter-current-password: "現在のパスワードを入力してください"
@@ -903,6 +919,7 @@ admin/views/index.vue:
   dashboard: "ダッシュボード"
   instance: "インスタンス"
   emoji: "カスタム絵文字"
+  moderators: "モデレーター"
   users: "ユーザー"
   update: "更新"
   announcements: "お知らせ"
@@ -947,7 +964,12 @@ admin/views/instance.vue:
   github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
   enable-github-integration: "GitHub連携を有効にする"
   github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
+  discord-integration-config: "Discord連携の設定"
+  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  enable-discord-integration: "Discord連携を有効にする"
+  discord-integration-client-id: "Client ID"
+  discord-integration-client-secret: "Client Secret"
   proxy-account-config: "プロキシアカウントの設定"
   proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
   proxy-account-username: "プロキシアカウントのユーザー名"
@@ -997,6 +1019,11 @@ admin/views/users.vue:
   unverify-user: "ユーザーの公式アカウント解除"
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
+admin/views/moderators.vue:
+  add-moderator:
+    title: "モデレーターの登録"
+    add: "登録"
+    added: "モデレーターを登録しました"
 admin/views/emoji.vue:
   add-emoji:
     title: "絵文字の登録"
@@ -1161,7 +1188,7 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
   request-pending: "フォロー許可待ち"
@@ -1324,6 +1351,10 @@ mobile/views/pages/settings.vue:
   github-connect: "GitHubアカウントに接続する"
   github-reconnect: "再接続する"
   github-disconnect: "切断する"
+  discord: "Discord連携"
+  discord-connect: "Discordアカウントに接続する"
+  discord-reconnect: "再接続する"
+  discord-disconnect: "切断する"
   update: "Atualizar Misskey"
   version: "Versão atual;"
   latest-version: "Última versão:"

locales/ru-RU.yml

@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
   destroy: "アンケートを破棄"
 common/views/components/reaction-picker.vue:
   choose-reaction: "リアクションを選択"
+common/views/components/emoji-picker.vue:
+  custom-emoji: "カスタム絵文字"
+  people: "人"
+  animals-and-nature: "動物&自然"
+  food-and-drink: "食べ物&飲み物"
+  activity: "アクティビティ"
+  travel-and-places: "場所"
+  objects: "物"
+  symbols: "記号"
+  flags: "旗"
 common/views/components/signin.vue:
   username: "ユーザー名"
   password: "パスワード"
@@ -353,6 +363,7 @@ common/views/components/signin.vue:
   or: "または"
   signin-with-twitter: "Twitterでログイン"
   signin-with-github: "GitHubでログイン"
+  signin-with-discord: "Discordでログイン"
   login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
   invitation-code: "招待コード"
@@ -398,6 +409,13 @@ common/views/components/github-setting.vue:
   reconnect: "再接続する"
   connect: "GitHubと接続する"
   disconnect: "切断する"
+common/views/components/discord-setting.vue:
+  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
+  connected-to: "次のDiscordアカウントに接続されています"
+  detail: "詳細..."
+  reconnect: "再接続する"
+  connect: "Discordと接続する"
+  disconnect: "切断する"
 common/views/components/uploader.vue:
   waiting: "待機中"
 common/views/components/visibility-chooser.vue:
@@ -588,12 +606,6 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
-desktop/views/components/follow-button.vue:
-  following: "フォロー中"
-  follow: "フォロー"
-  request-pending: "フォロー許可待ち"
-  follow-processing: "フォロー処理中"
-  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
   followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -829,6 +841,10 @@ common/views/components/mute-and-block.vue:
   block: "ブロック"
   no-muted-users: "ミュートしているユーザーはいません"
   no-blocked-users: "ブロックしているユーザーはいません"
+  word-mute: "ワードミュート"
+  muted-words: "ミュートされたキーワード"
+  muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
+  save: "保存"
 common/views/components/password-settings.vue:
   reset: "パスワードを変更する"
   enter-current-password: "現在のパスワードを入力してください"
@@ -903,6 +919,7 @@ admin/views/index.vue:
   dashboard: "ダッシュボード"
   instance: "インスタンス"
   emoji: "カスタム絵文字"
+  moderators: "モデレーター"
   users: "ユーザー"
   update: "更新"
   announcements: "お知らせ"
@@ -947,7 +964,12 @@ admin/views/instance.vue:
   github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
   enable-github-integration: "GitHub連携を有効にする"
   github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
+  discord-integration-config: "Discord連携の設定"
+  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  enable-discord-integration: "Discord連携を有効にする"
+  discord-integration-client-id: "Client ID"
+  discord-integration-client-secret: "Client Secret"
   proxy-account-config: "プロキシアカウントの設定"
   proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
   proxy-account-username: "プロキシアカウントのユーザー名"
@@ -997,6 +1019,11 @@ admin/views/users.vue:
   unverify-user: "ユーザーの公式アカウント解除"
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
+admin/views/moderators.vue:
+  add-moderator:
+    title: "モデレーターの登録"
+    add: "登録"
+    added: "モデレーターを登録しました"
 admin/views/emoji.vue:
   add-emoji:
     title: "絵文字の登録"
@@ -1161,7 +1188,7 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
   request-pending: "フォロー許可待ち"
@@ -1324,6 +1351,10 @@ mobile/views/pages/settings.vue:
   github-connect: "GitHubアカウントに接続する"
   github-reconnect: "再接続する"
   github-disconnect: "切断する"
+  discord: "Discord連携"
+  discord-connect: "Discordアカウントに接続する"
+  discord-reconnect: "再接続する"
+  discord-disconnect: "切断する"
   update: "Misskey Update"
   version: "バージョン:"
   latest-version: "最新のバージョン:"

locales/zh-CN.yml

@@ -5,138 +5,138 @@ meta:
 common:
   misskey: "A ⭐ of fediverse"
   about-title: "A ⭐ of fediverse."
-  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
+  about: "Misskey 是一个开源的程序 <b>decentralized microblogging service</b>. 我懒得翻译了... Sophisticated fully customizable Ui, varieties of reaction for posts, free file storage providing integrated management system and other advancing functions are available. Also, network system called “Fediverse” enables us to communicate with users on other Snss. Like, if you post something, then your posts will sent not only to Misskey but also mastodon. Just imagine that the planet is sending a microwave to other planet to communication."
   intro:
-    title: "Misskeyって？"
+    title: "什么是 Misskey 呢?"
     about: "Misskeyはオープンソースの<b>分散型マイクロブログSNS</b>です。リッチで高度にカスタマイズできるUI、投稿へのリアクション、ファイルを一元管理できるドライブなど、先進的な機能を揃えています。また、Fediverseと呼ばれるネットワークに接続できるため、他のSNSともやり取りできます。例えば、あなたが何か投稿すると、その投稿はMisskeyだけでなく他のSNSにも伝わります。ちょうどある惑星から他の惑星に電波を発信している様子をイメージしてください。"
-    features: "特徴"
+    features: "特点"
-    rich-contents: "投稿"
+    rich-contents: "发布"
-    rich-contents-desc: "自分の考え、話題の出来事、皆と共有したいことについて発信してください。必要であれば、様々な構文を使って投稿を装飾したり、好きな画像、動画などのファイルやアンケートを添付することもできます。"
+    rich-contents-desc: "您只需要发布您的想法, 热门话题或者任何您想分享的好东西. 你可以装饰你的文字, 加上你最喜欢的图片, 发送文件或者电影, 甚至创造一个投票. 这些事情您都可以在 Misskey 上做。"
-    reaction: "リアクション"
+    reaction: "情绪"
-    reaction-desc: "あなたの気持ちを伝える最も簡単な方法です。Misskeyは、他のユーザーの投稿に様々なリアクションを付けることができます。いちどMisskeyのリアクション機能を体験してしまうと、もう「いいね」の概念しか存在しないSNSには戻れなくなるかもしれません。"
+    reaction-desc: "一个最简单的方式去告诉别人你的情绪. Misskey 允许您在别人的帖子中加入各种的情绪反应类型, 就像 Facebook 一样. 在 Misskey 上的情感体验永远不会出现在其他只能点赞的SNSs上。"
-    ui: "インターフェース"
+    ui: "交互界面"
-    ui-desc: "どのようなUIが使いやすいかは人それぞれです。だから、Misskeyは自由度の高いUIを持っています。レイアウトやデザインを調整したり、カスタマイズ可能な様々なウィジェットを配置したりして、自分だけのホームを作ってください。"
+    ui-desc: "世界上没有一个UI可以适合每一个人. 所以, Misskey 提供一个可以高度定制的UI交互界面. 您可以通过编辑, 调整布局, 放置可选择的小部件来轻松定制您的专属UI界面。"
-    drive: "ドライブ"
+    drive: "Misskey 云盘"
-    drive-desc: "以前投稿したことのある画像をまた投稿したくなったことはありませんか？もしくは、アップロードしたファイルをフォルダ分けして整理したくなったことはありませんか？Misskeyの根幹に組み込まれたドライブ機能によってそれらが解決します。ファイルの共有も簡単です。"
+    drive-desc: "想要发布一张您已经上传过的照片吗? 想要组织,命名和为上传的文件创建文件夹吗? Misskey 云盘是一个最好的解决方案. "
-    outro: "他にもMisskeyにしかない機能はまだまだあるので、ぜひあなた自身の目で確かめてください。Misskeyは分散型SNSなので、このインスタンスが気に入らなければ他のインスタンスを試すこともできます。それでは、GLHF!"
+    outro: "进一步深挖 Misskey 的更多功能, 如果您感觉这个功能不适合我, 试试其他例子. 因为 Misskey 是一个分散的 SNS, 这样您就可以很容易找到适合自己的一部分."
   adblock:
-    detected: "広告ブロッカーを無効にしてください"
+    detected: "请关闭广告拦截器"
-    warning: "<strong>Misskeyは広告を掲載していません</strong>が、広告をブロックする機能が有効だと一部の機能が利用できなかったり、不具合が発生する場合があります。"
+    warning: "<strong>Misskey 不是广告网站</strong>如果您启用广告拦截器, 可能会导致某些功能无法正常使用。"
-  application-authorization: "アプリの連携"
+  application-authorization: "应用程序授权"
-  close: "閉じる"
+  close: "关闭"
-  do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
+  do-not-copy-paste: "请不要在这里输入或粘贴代码。您帐户可能会受到损害。"
-  load-more: "もっと読み込む"
+  load-more: "加载更多"
-  got-it: "わかった"
+  got-it: "没问题"
   customization-tips:
-    title: "カスタマイズのヒント"
+    title: "客制化提示"
-    paragraph: "<p>ホームのカスタマイズでは、ウィジェットを追加/削除したり、ドラッグ&ドロップして並べ替えたりすることができます。</p><p>一部のウィジェットは、<strong><strong>右</strong>クリック</strong>することで表示を変更することができます。</p><p>ウィジェットを削除するには、ヘッダーの<strong>「ゴミ箱」</strong>と書かれたエリアにウィジェットをドラッグ&ドロップします。</p><p>カスタマイズを終了するには、右上の「完了」をクリックします。</p>"
+    paragraph: "<p>主页定制允许您添加或删除, 拖放和重新排列小组件.</p></p>您可以通过<strong><strong>右键</strong>点击</strong>某些小部件来更改显示</p><p>若要删除小部件, 请将其拖到标头为<strong>「垃圾箱」</strong>的区域</p><p>如果您完成了定制过程,单击右上角的「完成」</p>"
-    gotit: "Got it!"
+    gotit: "没问题!"
   notification:
-    file-uploaded: "ファイルがアップロードされました"
+    file-uploaded: "文件已上传"
-    message-from: "{}さんからメッセージ:"
+    message-from: "信息来源 {}:"
-    reversi-invited: "対局への招待があります"
+    reversi-invited: "您已被邀请加入一场游戏"
-    reversi-invited-by: "{}さんから"
+    reversi-invited-by: "被邀请 {}:"
-    notified-by: "{}さんから"
+    notified-by: "通知 {}:"
-    reply-from: "{}さんから返信:"
+    reply-from: "回复 {}:"
-    quoted-by: "{}さんが引用:"
+    quoted-by: "引用 {}:"
   time:
-    unknown: "なぞのじかん"
+    unknown: "这是个啥??? 不知道哎"
     future: "未来"
-    just_now: "たった今"
+    just_now: "现在"
     seconds_ago: "{}秒前"
     minutes_ago: "{}分前"
-    hours_ago: "{}時間前"
+    hours_ago: "{}小时前"
-    days_ago: "{}日前"
+    days_ago: "{}天前"
-    weeks_ago: "{}週間前"
+    weeks_ago: "{}周前"
-    months_ago: "{}ヶ月前"
+    months_ago: "{}月前"
     years_ago: "{}年前"
   month-and-day: "{month}月 {day}日"
-  trash: "ゴミ箱"
+  trash: "垃圾箱"
-  drive: "ドライブ"
+  drive: "Misskey 云盘"
-  messaging: "トーク"
+  messaging: "聊天"
   weekday-short:
     sunday: "日"
-    monday: "月"
+    monday: "一"
-    tuesday: "火"
+    tuesday: "二"
-    wednesday: "水"
+    wednesday: "三"
-    thursday: "木"
+    thursday: "四"
-    friday: "金"
+    friday: "五"
-    saturday: "土"
+    saturday: "六"
   weekday:
-    sunday: "日曜日"
+    sunday: "星期日"
-    monday: "月曜日"
+    monday: "星期一"
-    tuesday: "火曜日"
+    tuesday: "星期二 "
-    wednesday: "水曜日"
+    wednesday: "星期三"
-    thursday: "木曜日"
+    thursday: "星期四"
-    friday: "金曜日"
+    friday: "星期五"
-    saturday: "土曜日"
+    saturday: "星期六"
   reactions:
-    like: "いいね"
+    like: "赞"
-    love: "しゅき"
+    love: "喜爱"
     laugh: "笑"
-    hmm: "ふぅ～む"
+    hmm: "emmm...?"
-    surprise: "わお"
+    surprise: "哇! "
-    congrats: "おめでとう"
+    congrats: "恭喜"
-    angry: "おこ"
+    angry: "生气"
-    confused: "こまこまのこまり"
+    confused: "困惑"
     rip: "RIP"
-    pudding: "Pudding"
+    pudding: "布丁"
   note-visibility:
-    public: "公開"
+    public: "公开"
-    home: "ホーム"
+    home: "首页"
-    home-desc: "ホームタイムラインにのみ公開"
+    home-desc: "仅发送至首页的时间线"
-    followers: "フォロワー"
+    followers: "关注者"
-    followers-desc: "自分のフォロワーにのみ公開"
+    followers-desc: "仅发送至粉丝"
-    specified: "ダイレクト"
+    specified: "指定用户"
-    specified-desc: "指定したユーザーにのみ公開"
+    specified-desc: "仅发送至指定用户"
-    private: "非公開"
+    private: "私密"
   note-placeholders:
-    a: "今どうしてる？"
+    a: "你在干什么？？"
-    b: "何かありましたか？"
+    b: "发生了什么？"
-    c: "何をお考えですか？"
+    c: "你有什么想法？"
-    d: "言いたいことは？"
+    d: "你想要发布些什么吗？"
-    e: "ここに書いてください"
+    e: "写下来吧"
-    f: "あなたが書くのを待っています..."
+    f: "等待你的书写..."
-  search: "検索"
+  search: "搜索"
-  delete: "削除"
+  delete: "删除"
-  loading: "読み込み中"
+  loading: "正在加载, 等着就好啦"
-  ok: "わかった"
+  ok: "没问题"
-  update-available-title: "更新があります"
+  update-available-title: "有可用更新"
-  update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
+  update-available: "新的 Misskey 版本现已发布({newer}。目前版本{current}). 刷新页面以应用更新。"
-  my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
+  my-token-regenerated: "您的 Token 已被重置, 您将自动登出。"
-  i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
+  i-like-sushi: "相比于布丁来说, 我更喜欢寿司。"
-  show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  show-reversi-board-labels: "在 Reversi 中显示行和列表签"
-  use-contrast-reversi-stones: "リバーシのアイコンにコントラストを付ける"
+  use-contrast-reversi-stones: "Make the stone color clear in Reversi"
-  verified-user: "公式アカウント"
+  verified-user: "认证用户"
-  disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
+  disable-animated-mfm: "在帖子中禁用动画文本"
-  always-show-nsfw: "常に閲覧注意のメディアを表示する"
+  always-show-nsfw: "总是显示 NSFW 的内容"
-  always-mark-nsfw: "常にメディアを閲覧注意として投稿"
+  always-mark-nsfw: "总是用 NSFW 来标记附件"
-  show-full-acct: "ユーザー名のホストを省略しない"
+  show-full-acct: "不要从用户名中忽略主机名"
-  show-via: "viaを表示する"
+  show-via: "显示..."
-  reduce-motion: "UIの動きを減らす"
+  reduce-motion: "减弱UI中的动画效果"
-  this-setting-is-this-device-only: "このデバイスのみ"
+  this-setting-is-this-device-only: "设置仅在本设备中生效"
-  use-os-default-emojis: "OS標準の絵文字を使用"
+  use-os-default-emojis: "使用设备系统默认的 emojis"
-  do-not-use-in-production: 'これは開発ビルドです。本番環境で使用しないでください。'
+  do-not-use-in-production: '这是一个开发者测试版.  请勿在生产环境中使用.'
-  is-remote-user: "このユーザー情報はコピーです。"
+  is-remote-user: "该用户的信息已被复制."
-  is-remote-post: "この投稿情報はコピーです。"
+  is-remote-post: "该投稿已被复制."
-  view-on-remote: "正確な情報を見る"
+  view-on-remote: "查看准确的信息"
   error:
-    title: '問題が発生しました'
+    title: '哦不, 发生了一些问题! :('
-    retry: 'やり直す'
+    retry: '重试'
   reversi:
-    drawn: "引き分け"
+    drawn: "平局"
-    my-turn: "あなたのターンです"
+    my-turn: "轮到你了"
-    opponent-turn: "相手のターンです"
+    opponent-turn: "轮到对手了"
-    turn-of: "{name}のターンです"
+    turn-of: "{name}转折点"
-    past-turn-of: "{name}のターン"
+    past-turn-of: "轮到{name}的回合了"
-    won: "{name}の勝ち"
+    won: "{name}获胜"
-    black: "黒"
+    black: "黑"
     white: "白"
-    total: "合計"
+    total: "合计"
-    this-turn: "{count}ターン目"
+    this-turn: "Turn {count}"
   widgets:
-    analog-clock: "アナログ時計"
+    analog-clock: "指针时钟"
-    profile: "プロフィール"
+    profile: "简介"
     calendar: "カレンダー"
     timemachine: "カレンダー(タイムマシン)"
     activity: "アクティビティ"
@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
   destroy: "アンケートを破棄"
 common/views/components/reaction-picker.vue:
   choose-reaction: "リアクションを選択"
+common/views/components/emoji-picker.vue:
+  custom-emoji: "カスタム絵文字"
+  people: "人"
+  animals-and-nature: "動物&自然"
+  food-and-drink: "食べ物&飲み物"
+  activity: "アクティビティ"
+  travel-and-places: "場所"
+  objects: "物"
+  symbols: "記号"
+  flags: "旗"
 common/views/components/signin.vue:
   username: "ユーザー名"
   password: "パスワード"
@@ -353,6 +363,7 @@ common/views/components/signin.vue:
   or: "または"
   signin-with-twitter: "Twitterでログイン"
   signin-with-github: "GitHubでログイン"
+  signin-with-discord: "Discordでログイン"
   login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
   invitation-code: "招待コード"
@@ -398,6 +409,13 @@ common/views/components/github-setting.vue:
   reconnect: "再接続する"
   connect: "GitHubと接続する"
   disconnect: "切断する"
+common/views/components/discord-setting.vue:
+  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
+  connected-to: "次のDiscordアカウントに接続されています"
+  detail: "詳細..."
+  reconnect: "再接続する"
+  connect: "Discordと接続する"
+  disconnect: "切断する"
 common/views/components/uploader.vue:
   waiting: "待機中"
 common/views/components/visibility-chooser.vue:
@@ -588,12 +606,6 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
-desktop/views/components/follow-button.vue:
-  following: "フォロー中"
-  follow: "フォロー"
-  request-pending: "フォロー許可待ち"
-  follow-processing: "フォロー処理中"
-  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
   followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -829,6 +841,10 @@ common/views/components/mute-and-block.vue:
   block: "ブロック"
   no-muted-users: "ミュートしているユーザーはいません"
   no-blocked-users: "ブロックしているユーザーはいません"
+  word-mute: "ワードミュート"
+  muted-words: "ミュートされたキーワード"
+  muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
+  save: "保存"
 common/views/components/password-settings.vue:
   reset: "パスワードを変更する"
   enter-current-password: "現在のパスワードを入力してください"
@@ -903,6 +919,7 @@ admin/views/index.vue:
   dashboard: "ダッシュボード"
   instance: "インスタンス"
   emoji: "カスタム絵文字"
+  moderators: "モデレーター"
   users: "ユーザー"
   update: "更新"
   announcements: "お知らせ"
@@ -947,7 +964,12 @@ admin/views/instance.vue:
   github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
   enable-github-integration: "GitHub連携を有効にする"
   github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
+  discord-integration-config: "Discord連携の設定"
+  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  enable-discord-integration: "Discord連携を有効にする"
+  discord-integration-client-id: "Client ID"
+  discord-integration-client-secret: "Client Secret"
   proxy-account-config: "プロキシアカウントの設定"
   proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
   proxy-account-username: "プロキシアカウントのユーザー名"
@@ -997,6 +1019,11 @@ admin/views/users.vue:
   unverify-user: "ユーザーの公式アカウント解除"
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
+admin/views/moderators.vue:
+  add-moderator:
+    title: "モデレーターの登録"
+    add: "登録"
+    added: "モデレーターを登録しました"
 admin/views/emoji.vue:
   add-emoji:
     title: "絵文字の登録"
@@ -1161,7 +1188,7 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
   request-pending: "フォロー許可待ち"
@@ -1324,6 +1351,10 @@ mobile/views/pages/settings.vue:
   github-connect: "GitHubアカウントに接続する"
   github-reconnect: "再接続する"
   github-disconnect: "切断する"
+  discord: "Discord連携"
+  discord-connect: "Discordアカウントに接続する"
+  discord-reconnect: "再接続する"
+  discord-disconnect: "切断する"
   update: "Misskey Update"
   version: "バージョン:"
   latest-version: "最新のバージョン:"

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "10.49.2",
+	"version": "10.52.0",
-	"clientVersion": "2.0.11761",
+	"clientVersion": "2.0.11848",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
@@ -176,6 +176,7 @@
 		"pug": "2.0.3",
 		"punycode": "2.1.1",
 		"qrcode": "1.3.2",
+		"randomcolor": "0.5.3",
 		"ratelimiter": "3.2.0",
 		"recaptcha-promise": "0.1.3",
 		"reconnecting-websocket": "4.1.10",
@@ -218,10 +219,10 @@
 		"vue-i18n": "8.3.1",
 		"vue-js-modal": "1.3.26",
 		"vue-loader": "15.4.2",
+		"vue-marquee-text-component": "1.1.0",
 		"vue-router": "3.0.1",
 		"vue-style-loader": "4.1.2",
 		"vue-svg-inline-loader": "1.2.1",
-		"vue-sweetalert2": "1.5.7",
 		"vue-template-compiler": "2.5.17",
 		"vuedraggable": "2.16.0",
 		"vuewordcloud": "18.7.11",

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

@@ -41,22 +41,22 @@ export default Vue.extend({
 
 	methods: {
 		add() {
-			this.announcements.push({
+			this.announcements.unshift({
 				title: '',
 				text: ''
 			});
 		},
 
 		remove(i) {
-			this.$swal({
+			this.$root.alert({
 				type: 'warning',
 				text: this.$t('_remove.are-you-sure').replace('$1', this.announcements.find((_, j) => j == i).title),
 				showCancelButton: true
 			}).then(res => {
-				if (!res.value) return;
+				if (!res) return;
 				this.announcements = this.announcements.filter((_, j) => j !== i);
 				this.save(true);
-				this.$swal({
+				this.$root.alert({
 					type: 'success',
 					text: this.$t('_remove.removed')
 				});
@@ -68,13 +68,13 @@ export default Vue.extend({
 				broadcasts: this.announcements
 			}).then(() => {
 				if (!silent) {
-					this.$swal({
+					this.$root.alert({
 						type: 'success',
 						text: this.$t('saved')
 					});
 				}
 			}).catch(e => {
-				this.$swal({
+				this.$root.alert({
 					type: 'error',
 					text: e
 				});

src/client/app/admin/views/ap-log.vue

@@ -3,17 +3,17 @@
 	<table>
 		<thead>
 			<tr>
-				<th><fa icon="exchange-alt"/> In/Out</th>
+				<th><fa :icon="faExchangeAlt"/> In/Out</th>
+				<th><fa :icon="faBolt"/> Activity</th>
 				<th><fa icon="server"/> Host</th>
-				<th><fa icon="bolt"/> Activity</th>
 				<th><fa icon="user"/> Actor</th>
 			</tr>
 		</thead>
 		<tbody>
 			<tr v-for="log in logs" :key="log.id">
 				<td :class="log.direction">{{ log.direction == 'in' ? '<' : '>' }} {{ log.direction }}</td>
-				<td>{{ log.host }}</td>
 				<td>{{ log.activity }}</td>
+				<td>{{ log.host }}</td>
 				<td>@{{ log.actor }}</td>
 			</tr>
 		</tbody>
@@ -23,12 +23,14 @@
 
 <script lang="ts">
 import Vue from 'vue';
+import { faBolt, faExchangeAlt } from '@fortawesome/free-solid-svg-icons';
 
 export default Vue.extend({
 	data() {
 		return {
 			logs: [],
-			connection: null
+			connection: null,
+			faBolt, faExchangeAlt
 		};
 	},
 

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

@@ -37,7 +37,7 @@
 		</div>
 		<div>
 			<div>
-				<div><fa icon="database"/></div>
+				<div><fa :icon="faDatabase"/></div>
 				<div>
 					<span>{{ $t('drive') }}</span>
 					<b>{{ stats.driveUsageLocal | bytes }}</b>
@@ -83,9 +83,11 @@ import i18n from '../../i18n';
 import XCpuMemory from "./cpu-memory.vue";
 import XCharts from "./charts.vue";
 import XApLog from "./ap-log.vue";
+import { faDatabase } from '@fortawesome/free-solid-svg-icons';
 
 export default Vue.extend({
 	i18n: i18n('admin/views/dashboard.vue'),
+
 	components: {
 		XCpuMemory,
 		XCharts,
@@ -96,7 +98,8 @@ export default Vue.extend({
 		return {
 			stats: null,
 			connection: null,
-			meta: null
+			meta: null,
+			faDatabase
 		};
 	},
 

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

@@ -23,7 +23,7 @@
 	</ui-card>
 
 	<ui-card>
-		<div slot="title"><fa :icon="['far', 'grin']"/> {{ $t('emojis.title') }}</div>
+		<div slot="title"><fa :icon="faGrin"/> {{ $t('emojis.title') }}</div>
 		<section v-for="emoji in emojis">
 			<img :src="emoji.url" :alt="emoji.name" style="width: 64px;"/>
 			<ui-horizon-group inputs>
@@ -50,6 +50,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../i18n';
+import { faGrin } from '@fortawesome/free-regular-svg-icons';
 
 export default Vue.extend({
 	i18n: i18n('admin/views/emoji.vue'),
@@ -58,7 +59,8 @@ export default Vue.extend({
 			name: '',
 			url: '',
 			aliases: '',
-			emojis: []
+			emojis: [],
+			faGrin
 		};
 	},
 
@@ -73,13 +75,13 @@ export default Vue.extend({
 				url: this.url,
 				aliases: this.aliases.split(' ').filter(x => x.length > 0)
 			}).then(() => {
-				this.$swal({
+				this.$root.alert({
 					type: 'success',
 					text: this.$t('add-emoji.added')
 				});
 				this.fetchEmojis();
 			}).catch(e => {
-				this.$swal({
+				this.$root.alert({
 					type: 'error',
 					text: e
 				});
@@ -101,12 +103,12 @@ export default Vue.extend({
 				url: emoji.url,
 				aliases: emoji.aliases.split(' ').filter(x => x.length > 0)
 			}).then(() => {
-				this.$swal({
+				this.$root.alert({
 					type: 'success',
 					text: this.$t('updated')
 				});
 			}).catch(e => {
-				this.$swal({
+				this.$root.alert({
 					type: 'error',
 					text: e
 				});
@@ -114,23 +116,23 @@ export default Vue.extend({
 		},
 
 		removeEmoji(emoji) {
-			this.$swal({
+			this.$root.alert({
 				type: 'warning',
 				text: this.$t('remove-emoji.are-you-sure').replace('$1', emoji.name),
 				showCancelButton: true
 			}).then(res => {
-				if (!res.value) return;
+				if (!res) return;
 
 				this.$root.api('admin/emoji/remove', {
 					id: emoji.id
 				}).then(() => {
-					this.$swal({
+					this.$root.alert({
 						type: 'success',
 						text: this.$t('remove-emoji.removed')
 					});
 					this.fetchEmojis();
 				}).catch(e => {
-					this.$swal({
+					this.$root.alert({
 						type: 'error',
 						text: e
 					});

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

@@ -20,8 +20,9 @@
 		<ul>
 			<li @click="nav('dashboard')" :class="{ active: page == 'dashboard' }"><fa icon="home" fixed-width/>{{ $t('dashboard') }}</li>
 			<li @click="nav('instance')" :class="{ active: page == 'instance' }"><fa icon="cog" fixed-width/>{{ $t('instance') }}</li>
+			<li @click="nav('moderators')" :class="{ active: page == 'moderators' }"><fa :icon="faHeadset" fixed-width/>{{ $t('moderators') }}</li>
 			<li @click="nav('users')" :class="{ active: page == 'users' }"><fa icon="users" fixed-width/>{{ $t('users') }}</li>
-			<li @click="nav('emoji')" :class="{ active: page == 'emoji' }"><fa :icon="['far', 'grin']" fixed-width/>{{ $t('emoji') }}</li>
+			<li @click="nav('emoji')" :class="{ active: page == 'emoji' }"><fa :icon="faGrin" fixed-width/>{{ $t('emoji') }}</li>
 			<li @click="nav('announcements')" :class="{ active: page == 'announcements' }"><fa icon="broadcast-tower" fixed-width/>{{ $t('announcements') }}</li>
 			<li @click="nav('hashtags')" :class="{ active: page == 'hashtags' }"><fa icon="hashtag" fixed-width/>{{ $t('hashtags') }}</li>
 
@@ -29,21 +30,29 @@
 			<!-- <li @click="nav('update')" :class="{ active: page == 'update' }">{{ $t('update') }}</li> -->
 		</ul>
 		<div class="back-to-misskey">
-			<a href="/"><fa icon="arrow-left"/> {{ $t('back-to-misskey') }}</a>
+			<a href="/"><fa :icon="faArrowLeft"/> {{ $t('back-to-misskey') }}</a>
 		</div>
 		<div class="version">
 			<small>Misskey {{ version }}</small>
 		</div>
 	</nav>
 	<main>
-		<div v-if="page == 'dashboard'"><x-dashboard/></div>
+		<marquee-text v-if="instances.length > 0" class="instances" :repeat="10" :duration="30">
-		<div v-if="page == 'instance'"><x-instance/></div>
+			<span v-for="instance in instances" class="instance">
-		<div v-if="page == 'users'"><x-users/></div>
+				<b :style="{ background: instance.bg }">{{ instance.host }}</b>{{ instance.notesCount | number }} / {{ instance.usersCount | number }}
-		<div v-if="page == 'emoji'"><x-emoji/></div>
+			</span>
-		<div v-if="page == 'announcements'"><x-announcements/></div>
+		</marquee-text>
-		<div v-if="page == 'hashtags'"><x-hashtags/></div>
+		<div class="page">
-		<div v-if="page == 'drive'"></div>
+			<div v-if="page == 'dashboard'"><x-dashboard/></div>
-		<div v-if="page == 'update'"></div>
+			<div v-if="page == 'instance'"><x-instance/></div>
+			<div v-if="page == 'moderators'"><x-moderators/></div>
+			<div v-if="page == 'users'"><x-users/></div>
+			<div v-if="page == 'emoji'"><x-emoji/></div>
+			<div v-if="page == 'announcements'"><x-announcements/></div>
+			<div v-if="page == 'hashtags'"><x-hashtags/></div>
+			<div v-if="page == 'drive'"></div>
+			<div v-if="page == 'update'"></div>
+		</div>
 	</main>
 </div>
 </template>
@@ -54,10 +63,15 @@ import i18n from '../../i18n';
 import { version } from '../../config';
 import XDashboard from "./dashboard.vue";
 import XInstance from "./instance.vue";
+import XModerators from "./moderators.vue";
 import XEmoji from "./emoji.vue";
 import XAnnouncements from "./announcements.vue";
 import XHashtags from "./hashtags.vue";
 import XUsers from "./users.vue";
+import { faHeadset, faArrowLeft } from '@fortawesome/free-solid-svg-icons';
+import { faGrin } from '@fortawesome/free-regular-svg-icons';
+import MarqueeText from 'vue-marquee-text-component';
+import randomColor from 'randomcolor';
 
 // Detect the user agent
 const ua = navigator.userAgent.toLowerCase();
@@ -68,10 +82,12 @@ export default Vue.extend({
 	components: {
 		XDashboard,
 		XInstance,
+		XModerators,
 		XEmoji,
 		XAnnouncements,
 		XHashtags,
-		XUsers
+		XUsers,
+		MarqueeText
 	},
 	provide: {
 		isMobile
@@ -81,9 +97,26 @@ export default Vue.extend({
 			page: 'dashboard',
 			version,
 			isMobile,
-			navOpend: !isMobile
+			navOpend: !isMobile,
+			instances: [],
+			faGrin,
+			faArrowLeft,
+			faHeadset
 		};
 	},
+	created() {
+		this.$root.api('instances', {
+			sort: '+notes'
+		}).then(instances => {
+			instances.forEach(i => {
+				i.bg = randomColor({
+					seed: i.host,
+					luminosity: 'dark'
+				});
+			});
+			this.instances = instances;
+		});
+	},
 	methods: {
 		nav(page: string) {
 			this.page = page;
@@ -92,7 +125,7 @@ export default Vue.extend({
 });
 </script>
 
-<style lang="stylus">
+<style lang="stylus" scoped>
 .mk-admin
 	$headerHeight = 48px
 
@@ -253,7 +286,23 @@ export default Vue.extend({
 	> main
 		width 100%
 		padding 0 0 0 250px
-		max-width 1300px
+
+		> .instances
+			padding 10px
+			background #000
+			color #fff
+			font-size 13px
+
+			>>> .instance
+				margin 0 10px
+
+				> b
+					padding 0px 6px
+					margin-right 4px
+					border-radius 4px
+
+		> .page
+			max-width 1300px
 
 	&.isMobile
 		> main

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

@@ -10,7 +10,7 @@
 			<ui-input v-model="languages"><i slot="icon"><fa icon="language"/></i>{{ $t('languages') }}<span slot="desc">{{ $t('languages-desc') }}</span></ui-input>
 		</section>
 		<section class="fit-bottom">
-			<header><fa icon="headset"/> {{ $t('maintainer-config') }}</header>
+			<header><fa :icon="faHeadset"/> {{ $t('maintainer-config') }}</header>
 			<ui-input v-model="maintainerName">{{ $t('maintainer-name') }}</ui-input>
 			<ui-input v-model="maintainerEmail" type="email"><i slot="icon"><fa :icon="['far', 'envelope']"/></i>{{ $t('maintainer-email') }}</ui-input>
 		</section>
@@ -24,14 +24,14 @@
 			<ui-input v-model="remoteDriveCapacityMb" type="number" :disabled="!cacheRemoteFiles">{{ $t('remote-drive-capacity-mb') }}<span slot="suffix">MB</span><span slot="desc">{{ $t('mb') }}</span></ui-input>
 		</section>
 		<section class="fit-bottom">
-			<header><fa icon="shield-alt"/> {{ $t('recaptcha-config') }}</header>
+			<header><fa :icon="faShieldAlt"/> {{ $t('recaptcha-config') }}</header>
 			<ui-switch v-model="enableRecaptcha">{{ $t('enable-recaptcha') }}</ui-switch>
 			<ui-info>{{ $t('recaptcha-info') }}</ui-info>
 			<ui-input v-model="recaptchaSiteKey" :disabled="!enableRecaptcha"><i slot="icon"><fa icon="key"/></i>{{ $t('recaptcha-site-key') }}</ui-input>
 			<ui-input v-model="recaptchaSecretKey" :disabled="!enableRecaptcha"><i slot="icon"><fa icon="key"/></i>{{ $t('recaptcha-secret-key') }}</ui-input>
 		</section>
 		<section>
-			<header><fa icon="ghost"/> {{ $t('proxy-account-config') }}</header>
+			<header><fa :icon="faGhost"/> {{ $t('proxy-account-config') }}</header>
 			<ui-info>{{ $t('proxy-account-info') }}</ui-info>
 			<ui-input v-model="proxyAccount"><span slot="prefix">@</span>{{ $t('proxy-account-username') }}<span slot="desc">{{ $t('proxy-account-username-desc') }}</span></ui-input>
 			<ui-info warn>{{ $t('proxy-account-warn') }}</ui-info>
@@ -76,6 +76,17 @@
 			<ui-button @click="updateMeta">{{ $t('save') }}</ui-button>
 		</section>
 	</ui-card>
+
+	<ui-card>
+		<div slot="title"><fa :icon="['fab', 'discord']"/> {{ $t('discord-integration-config') }}</div>
+		<section>
+			<ui-switch v-model="enableDiscordIntegration">{{ $t('enable-discord-integration') }}</ui-switch>
+			<ui-info>{{ $t('discord-integration-info') }}</ui-info>
+			<ui-input v-model="discordClientId" :disabled="!enableDiscordIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('discord-integration-client-id') }}</ui-input>
+			<ui-input v-model="discordClientSecret" :disabled="!enableDiscordIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('discord-integration-client-secret') }}</ui-input>
+			<ui-button @click="updateMeta">{{ $t('save') }}</ui-button>
+		</section>
+	</ui-card>
 </div>
 </template>
 
@@ -84,9 +95,11 @@ 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';
 
 export default Vue.extend({
 	i18n: i18n('admin/views/instance.vue'),
+
 	data() {
 		return {
 			host: toUnicode(host),
@@ -111,8 +124,12 @@ export default Vue.extend({
 			enableGithubIntegration: false,
 			githubClientId: null,
 			githubClientSecret: null,
+			enableDiscordIntegration: false,
+			discordClientId: null,
+			discordClientSecret: null,
 			proxyAccount: null,
 			inviteCode: null,
+			faHeadset, faShieldAlt, faGhost
 		};
 	},
 
@@ -138,6 +155,9 @@ export default Vue.extend({
 			this.enableGithubIntegration = meta.enableGithubIntegration;
 			this.githubClientId = meta.githubClientId;
 			this.githubClientSecret = meta.githubClientSecret;
+			this.enableDiscordIntegration = meta.enableDiscordIntegration;
+			this.discordClientId = meta.discordClientId;
+			this.discordClientSecret = meta.discordClientSecret;
 		});
 	},
 
@@ -146,7 +166,7 @@ export default Vue.extend({
 			this.$root.api('admin/invite').then(x => {
 				this.inviteCode = x.code;
 			}).catch(e => {
-				this.$swal({
+				this.$root.alert({
 					type: 'error',
 					text: e
 				});
@@ -177,13 +197,16 @@ export default Vue.extend({
 				enableGithubIntegration: this.enableGithubIntegration,
 				githubClientId: this.githubClientId,
 				githubClientSecret: this.githubClientSecret,
+				enableDiscordIntegration: this.enableDiscordIntegration,
+				discordClientId: this.discordClientId,
+				discordClientSecret: this.discordClientSecret
 			}).then(() => {
-				this.$swal({
+				this.$root.alert({
 					type: 'success',
 					text: this.$t('saved')
 				});
 			}).catch(e => {
-				this.$swal({
+				this.$root.alert({
 					type: 'error',
 					text: e
 				});

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

@@ -0,0 +1,61 @@
+<template>
+<div class="jnhmugbb">
+	<ui-card>
+		<div slot="title"><fa icon="plus"/> {{ $t('add-moderator.title') }}</div>
+		<section class="fit-top">
+			<ui-input v-model="username" type="text">
+				<span slot="prefix">@</span>
+			</ui-input>
+			<ui-button @click="add" :disabled="adding">{{ $t('add-moderator.add') }}</ui-button>
+		</section>
+	</ui-card>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../i18n';
+import parseAcct from "../../../../misc/acct/parse";
+
+export default Vue.extend({
+	i18n: i18n('admin/views/moderators.vue'),
+
+	data() {
+		return {
+			username: '',
+			adding: false
+		};
+	},
+
+	methods: {
+		async add() {
+			this.adding = true;
+
+			const process = async () => {
+				const user = await this.$root.api('users/show', parseAcct(this.username));
+				await this.$root.api('admin/moderators/add', { userId: user.id });
+				this.$root.alert({
+					type: 'success',
+					text: this.$t('add-moderator.added')
+				});
+			};
+
+			await process().catch(e => {
+				this.$root.alert({
+					type: 'error',
+					text: e.toString()
+				});
+			});
+
+			this.adding = false;
+		},
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.jnhmugbb
+	@media (min-width 500px)
+		padding 16px
+
+</style>

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

@@ -49,6 +49,7 @@ import parseAcct from "../../../../misc/acct/parse";
 
 export default Vue.extend({
 	i18n: i18n('admin/views/users.vue'),
+
 	data() {
 		return {
 			verifyUsername: null,
@@ -67,13 +68,19 @@ export default Vue.extend({
 			this.verifying = true;
 
 			const process = async () => {
-				const user = await this.$root.os.api('users/show', parseAcct(this.verifyUsername));
+				const user = await this.$root.api('users/show', parseAcct(this.verifyUsername));
-				await this.$root.os.api('admin/verify-user', { userId: user.id });
+				await this.$root.api('admin/verify-user', { userId: user.id });
-				//this.$root.os.apis.dialog({ text: this.$t('verified') });
+				this.$root.alert({
+					type: 'success',
+					text: this.$t('verified')
+				});
 			};
 
 			await process().catch(e => {
-				//this.$root.os.apis.dialog({ text: `Failed: ${e}` });
+				this.$root.alert({
+					type: 'error',
+					text: e.toString()
+				});
 			});
 
 			this.verifying = false;
@@ -83,13 +90,19 @@ export default Vue.extend({
 			this.unverifying = true;
 
 			const process = async () => {
-				const user = await this.$root.os.api('users/show', parseAcct(this.unverifyUsername));
+				const user = await this.$root.api('users/show', parseAcct(this.unverifyUsername));
-				await this.$root.os.api('admin/unverify-user', { userId: user.id });
+				await this.$root.api('admin/unverify-user', { userId: user.id });
-				//this.$root.os.apis.dialog({ text: this.$t('unverified') });
+				this.$root.alert({
+					type: 'success',
+					text: this.$t('unverified')
+				});
 			};
 
 			await process().catch(e => {
-				//this.$root.os.apis.dialog({ text: `Failed: ${e}` });
+				this.$root.alert({
+					type: 'error',
+					text: e.toString()
+				});
 			});
 
 			this.unverifying = false;
@@ -99,13 +112,19 @@ export default Vue.extend({
 			this.suspending = true;
 
 			const process = async () => {
-				const user = await this.$root.os.api('users/show', parseAcct(this.suspendUsername));
+				const user = await this.$root.api('users/show', parseAcct(this.suspendUsername));
-				await this.$root.os.api('admin/suspend-user', { userId: user.id });
+				await this.$root.api('admin/suspend-user', { userId: user.id });
-				//this.$root.os.apis.dialog({ text: this.$t('suspended') });
+				this.$root.alert({
+					type: 'success',
+					text: this.$t('suspended')
+				});
 			};
 
 			await process().catch(e => {
-				//this.$root.os.apis.dialog({ text: `Failed: ${e}` });
+				this.$root.alert({
+					type: 'error',
+					text: e.toString()
+				});
 			});
 
 			this.suspending = false;
@@ -115,13 +134,19 @@ export default Vue.extend({
 			this.unsuspending = true;
 
 			const process = async () => {
-				const user = await this.$root.os.api('users/show', parseAcct(this.unsuspendUsername));
+				const user = await this.$root.api('users/show', parseAcct(this.unsuspendUsername));
-				await this.$root.os.api('admin/unsuspend-user', { userId: user.id });
+				await this.$root.api('admin/unsuspend-user', { userId: user.id });
-				//this.$root.os.apis.dialog({ text: this.$t('unsuspended') });
+				this.$root.alert({
+					type: 'success',
+					text: this.$t('unsuspended')
+				});
 			};
 
 			await process().catch(e => {
-				//this.$root.os.apis.dialog({ text: `Failed: ${e}` });
+				this.$root.alert({
+					type: 'error',
+					text: e.toString()
+				});
 			});
 
 			this.unsuspending = false;

src/client/app/app.styl

@@ -123,29 +123,3 @@ pre
 
 [data-icon]
 	display inline-block
-
-.swal2-container
-	z-index 10000 !important
-
-	&.swal2-shown
-		background-color rgba(0, 0, 0, 0.5) !important
-
-.swal2-popup
-	background var(--face) !important
-
-.swal2-content
-	color var(--text) !important
-
-.swal2-confirm
-	background-color var(--primary) !important
-	border-left-color var(--primary) !important
-	border-right-color var(--primary) !important
-	color var(--primaryForeground) !important
-
-	&:hover
-		background-image none !important
-		background-color var(--primaryDarken5) !important
-
-	&:active
-		background-image none !important
-		background-color var(--primaryDarken5) !important

src/client/app/boot.js

@@ -43,6 +43,9 @@
 	if (`${url.pathname}/`.startsWith('/admin/')) app = 'admin';
 	//#endregion
 
+	// Script version
+	const ver = localStorage.getItem('v') || VERSION;
+
 	//#region Detect the user language
 	let lang = null;
 
@@ -67,7 +70,7 @@
 
 	let locale = localStorage.getItem('locale');
 	if (locale == null) {
-		const locale = await fetch(`/assets/locales/${lang}.json`)
+		const locale = await fetch(`/assets/locales/${lang}.json?ver=${ver}`)
 			.then(response => response.json());
 
 			localStorage.setItem('locale', JSON.stringify(locale));
@@ -98,9 +101,6 @@
 		app = isMobile ? 'mobile' : 'desktop';
 	}
 
-	// Script version
-	const ver = localStorage.getItem('v') || VERSION;
-
 	// Get salt query
 	const salt = localStorage.getItem('salt')
 		? `?salt=${localStorage.getItem('salt')}`

src/client/app/common/scripts/check-for-update.ts

@@ -22,7 +22,7 @@ export default async function($root: any, force = false, silent = false) {
 		}
 
 		if (!silent) {
-			$root.$dialog({
+			$root.alert({
 				title: $root.$t('@.update-available-title'),
 				text: $root.$t('@.update-available', { newer, current })
 			});

src/client/app/common/scripts/fuck-ad-block.ts

@@ -4,12 +4,9 @@ export default ($root: any) => {
 	require('fuckadblock');
 
 	function adBlockDetected() {
-		$root.$dialog({
+		$root.alert({
 			title: $root.$t('@.adblock.detected'),
-			text: $root.$t('@.adblock.warning'),
+			text: $root.$t('@.adblock.warning')
-			actins: [{
-				text: 'OK'
-			}]
 		});
 	}
 

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

@@ -3,7 +3,6 @@ import { sum } from '../../../../prelude/array';
 import shouldMuteNote from './should-mute-note';
 import MkNoteMenu from '../views/components/note-menu.vue';
 import MkReactionPicker from '../views/components/reaction-picker.vue';
-import Ok from '../views/components/ok.vue';
 
 function focus(el, fn) {
 	const target = fn(el);
@@ -142,7 +141,10 @@ export default (opts: Opts = {}) => ({
 			this.$root.api('notes/favorites/create', {
 				noteId: this.appearNote.id
 			}).then(() => {
-				this.$root.new(Ok);
+				this.$root.alert({
+					type: 'success',
+					splash: true
+				});
 			});
 		},
 

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

@@ -0,0 +1,197 @@
+<template>
+<div class="felqjxyj" :class="{ splash }">
+	<div class="bg" ref="bg" @click="onBgClick"></div>
+	<div class="main" ref="main">
+		<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-button @click="ok" primary autofocus>OK</ui-button>
+			<ui-button @click="cancel" v-if="showCancelButton">Cancel</ui-button>
+		</ui-horizon-group>
+	</div>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import * as anime from 'animejs';
+import { faTimesCircle, faQuestionCircle } from '@fortawesome/free-regular-svg-icons';
+
+export default Vue.extend({
+	props: {
+		type: {
+			type: String,
+			required: false,
+			default: 'info'
+		},
+		title: {
+			type: String,
+			required: false
+		},
+		text: {
+			type: String,
+			required: false
+		},
+		showCancelButton: {
+			type: Boolean,
+			default: false
+		},
+		splash: {
+			type: Boolean,
+			default: false
+		}
+	},
+
+	computed: {
+		icon(): any {
+			switch (this.type) {
+				case 'success': return 'check';
+				case 'error': return faTimesCircle;
+				case 'warning': return 'exclamation-triangle';
+				case 'info': return 'info-circle';
+				case 'question': return faQuestionCircle;
+			}
+		}
+	},
+
+	mounted() {
+		this.$nextTick(() => {
+			(this.$refs.bg as any).style.pointerEvents = 'auto';
+			anime({
+				targets: this.$refs.bg,
+				opacity: 1,
+				duration: 100,
+				easing: 'linear'
+			});
+
+			anime({
+				targets: this.$refs.main,
+				opacity: 1,
+				scale: [1.2, 1],
+				duration: 300,
+				easing: [0, 0.5, 0.5, 1]
+			});
+
+			if (this.splash) {
+				setTimeout(() => {
+					this.close();
+				}, 1000);
+			}
+		});
+	},
+
+	methods: {
+		ok() {
+			this.$emit('ok');
+			this.close();
+		},
+
+		cancel() {
+			this.$emit('cancel');
+			this.close();
+		},
+
+		close() {
+			(this.$refs.bg as any).style.pointerEvents = 'none';
+			anime({
+				targets: this.$refs.bg,
+				opacity: 0,
+				duration: 300,
+				easing: 'linear'
+			});
+
+			(this.$refs.main as any).style.pointerEvents = 'none';
+			anime({
+				targets: this.$refs.main,
+				opacity: 0,
+				scale: 0.8,
+				duration: 300,
+				easing: [0, 0.5, 0.5, 1],
+				complete: () => this.destroyDom()
+			});
+		},
+
+		onBgClick() {
+			this.cancel();
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.felqjxyj
+	display flex
+	align-items center
+	justify-content center
+	position fixed
+	z-index 30000
+	top 0
+	left 0
+	width 100%
+	height 100%
+
+	&.splash
+		&, *
+			pointer-events none !important
+
+		> .main
+			min-width 0
+			width initial
+
+	> .bg
+		display block
+		position fixed
+		top 0
+		left 0
+		width 100%
+		height 100%
+		background rgba(#000, 0.7)
+		opacity 0
+		pointer-events none
+
+	> .main
+		display block
+		position fixed
+		margin auto
+		padding 32px
+		min-width 320px
+		max-width 480px
+		width calc(100% - 32px)
+		text-align center
+		background var(--face)
+		border-radius 8px
+		color var(--faceText)
+		opacity 0
+
+		> .icon
+			font-size 32px
+
+			&.success
+				color #37ec92
+
+			&.error
+				color #ec4137
+
+			&.warning
+				color #ecb637
+
+			> *
+				display block
+				margin 0 auto
+
+		> header
+			margin 16px 0 8px 0
+			font-weight bold
+			font-size 20px
+
+			& + .body
+				margin-top 8px
+
+		> .body
+			margin 16px 0
+
+		> .buttons
+			margin-top 16px
+
+</style>

src/client/app/common/views/components/discord-setting.vue

@@ -0,0 +1,64 @@
+<template>
+<div class="mk-discord-setting">
+	<p>{{ $t('description') }}</p>
+	<p class="account" v-if="$store.state.i.discord" :title="`Discord ID: ${$store.state.i.discord.id}`">{{ $t('connected-to') }}: <a :href="`https://discordapp.com/users/${$store.state.i.discord.id}`" target="_blank">@{{ $store.state.i.discord.username }}#{{ $store.state.i.discord.discriminator }}</a></p>
+	<p>
+		<a :href="`${apiUrl}/connect/discord`" target="_blank" @click.prevent="connect">{{ $store.state.i.discord ? this.$t('reconnect') : this.$t('connect') }}</a>
+		<span v-if="$store.state.i.discord"> or </span>
+		<a :href="`${apiUrl}/disconnect/discord`" target="_blank" v-if="$store.state.i.discord" @click.prevent="disconnect">{{ $t('disconnect') }}</a>
+	</p>
+	<p class="id" v-if="$store.state.i.discord">Discord ID: {{ $store.state.i.discord.id }}</p>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../i18n';
+import { apiUrl } from '../../../config';
+
+export default Vue.extend({
+	i18n: i18n('common/views/components/discord-setting.vue'),
+	data() {
+		return {
+			form: null,
+			apiUrl
+		};
+	},
+	mounted() {
+		this.$watch('$store.state.i', () => {
+			if (this.$store.state.i.discord && this.form)
+				this.form.close();
+		}, {
+			deep: true
+		});
+	},
+	methods: {
+		connect() {
+			this.form = window.open(apiUrl + '/connect/discord',
+				'discord_connect_window',
+				'height=570, width=520');
+		},
+
+		disconnect() {
+			window.open(apiUrl + '/disconnect/discord',
+				'discord_disconnect_window',
+				'height=570, width=520');
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.mk-discord-setting
+	.account
+		border solid 1px #e1e8ed
+		border-radius 4px
+		padding 16px
+
+		a
+			font-weight bold
+			color inherit
+
+	.id
+		color #8899a6
+</style>

src/client/app/common/views/components/index.ts

@@ -27,8 +27,6 @@ import uploader from './uploader.vue';
 import streamIndicator from './stream-indicator.vue';
 import ellipsis from './ellipsis.vue';
 import urlPreview from './url-preview.vue';
-import twitterSetting from './twitter-setting.vue';
-import githubSetting from './github-setting.vue';
 import fileTypeIcon from './file-type-icon.vue';
 import emoji from './emoji.vue';
 import welcomeTimeline from './welcome-timeline.vue';
@@ -72,8 +70,6 @@ Vue.component('mk-uploader', uploader);
 Vue.component('mk-stream-indicator', streamIndicator);
 Vue.component('mk-ellipsis', ellipsis);
 Vue.component('mk-url-preview', urlPreview);
-Vue.component('mk-twitter-setting', twitterSetting);
-Vue.component('mk-github-setting', githubSetting);
 Vue.component('mk-file-type-icon', fileTypeIcon);
 Vue.component('mk-emoji', emoji);
 Vue.component('mk-welcome-timeline', welcomeTimeline);

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

@@ -20,7 +20,7 @@
 	<footer>
 		<transition name="fade">
 			<div class="new-message" v-show="showIndicator">
-				<button @click="onIndicatorClick"><i><fa icon="arrow-circle-down"/></i>{{ $t('new-message') }}</button>
+				<button @click="onIndicatorClick"><i><fa :icon="faArrowCircleDown"/></i>{{ $t('new-message') }}</button>
 			</div>
 		</transition>
 		<x-form :user="user" ref="form"/>
@@ -34,6 +34,7 @@ import i18n from '../../../i18n';
 import XMessage from './messaging-room.message.vue';
 import XForm from './messaging-room.form.vue';
 import { url } from '../../../config';
+import { faArrowCircleDown } from '@fortawesome/free-solid-svg-icons';
 
 export default Vue.extend({
 	i18n: i18n('common/views/components/messaging-room.vue'),
@@ -52,7 +53,8 @@ export default Vue.extend({
 			existMoreMessages: false,
 			connection: null,
 			showIndicator: false,
-			timer: null
+			timer: null,
+			faArrowCircleDown
 		};
 	},
 

src/client/app/common/views/components/note-menu.vue

@@ -9,7 +9,6 @@ import Vue from 'vue';
 import i18n from '../../../i18n';
 import { url } from '../../../config';
 import copyToClipboard from '../../../common/scripts/copy-to-clipboard';
-import Ok from './ok.vue';
 import { concat, intersperse } from '../../../../../prelude/array';
 
 export default Vue.extend({
@@ -56,7 +55,7 @@ export default Vue.extend({
 							}
 					] : []
 				], [
-					this.note.userId == this.$store.state.i.id || this.$store.state.i.isAdmin ? [{
+					this.note.userId == this.$store.state.i.id || this.$store.state.i.isAdmin || this.$store.state.i.isModerator ? [{
 						icon: ['far', 'trash-alt'],
 						text: this.$t('delete'),
 						action: this.del
@@ -79,7 +78,10 @@ export default Vue.extend({
 			this.$root.api('i/pin', {
 				noteId: this.note.id
 			}).then(() => {
-				this.$root.new(Ok);
+				this.$root.alert({
+					type: 'success',
+					splash: true
+				});
 				this.destroyDom();
 			});
 		},
@@ -93,11 +95,18 @@ export default Vue.extend({
 		},
 
 		del() {
-			if (!window.confirm(this.$t('delete-confirm'))) return;
+			this.$root.alert({
-			this.$root.api('notes/delete', {
+				type: 'warning',
-				noteId: this.note.id
+				text: this.$t('delete-confirm'),
-			}).then(() => {
+				showCancelButton: true
-				this.destroyDom();
+			}).then(res => {
+				if (!res) return;
+
+				this.$root.api('notes/delete', {
+					noteId: this.note.id
+				}).then(() => {
+					this.destroyDom();
+				});
 			});
 		},
 
@@ -105,7 +114,10 @@ export default Vue.extend({
 			this.$root.api('notes/favorites/create', {
 				noteId: this.note.id
 			}).then(() => {
-				this.$root.new(Ok);
+				this.$root.alert({
+					type: 'success',
+					splash: true
+				});
 				this.destroyDom();
 			});
 		},
@@ -114,7 +126,10 @@ export default Vue.extend({
 			this.$root.api('notes/favorites/delete', {
 				noteId: this.note.id
 			}).then(() => {
-				this.$root.new(Ok);
+				this.$root.alert({
+					type: 'success',
+					splash: true
+				});
 				this.destroyDom();
 			});
 		},

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

@@ -1,175 +0,0 @@
-<template>
-<div class="yvbkymdqeusiqucuuloahhiqflzinufs">
-	<div class="bg" ref="bg"></div>
-	<div class="body" ref="body">
-		<div class="icon">
-			<div class="circle left"></div>
-			<span class="check tip"></span>
-			<span class="check long"></span>
-			<div class="ring"></div>
-			<div class="fix"></div>
-			<div class="circle right"></div>
-		</div>
-	</div>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import * as anime from 'animejs';
-
-export default Vue.extend({
-	mounted() {
-		this.$nextTick(() => {
-			anime({
-				targets: this.$refs.bg,
-				opacity: 1,
-				duration: 300,
-				easing: 'linear'
-			});
-
-			anime({
-				targets: this.$refs.body,
-				opacity: 1,
-				scale: [1.2, 1],
-				duration: 300,
-				easing: [0, 0.5, 0.5, 1]
-			});
-		});
-
-		setTimeout(() => {
-			anime({
-				targets: this.$refs.bg,
-				opacity: 0,
-				duration: 300,
-				easing: 'linear'
-			});
-
-			anime({
-				targets: this.$refs.body,
-				opacity: 0,
-				scale: 0.8,
-				duration: 300,
-				easing: [0.5, 0, 1, 0.5],
-				complete: () => this.destroyDom()
-			});
-		}, 1250);
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.yvbkymdqeusiqucuuloahhiqflzinufs
-	pointer-events none
-
-	> .bg
-		display block
-		position fixed
-		z-index 10000
-		top 0
-		left 0
-		width 100%
-		height 100%
-		background rgba(#000, 0.7)
-		opacity 0
-
-	> .body
-		position fixed
-		z-index 10000
-		top 0
-		right 0
-		left 0
-		bottom 0
-		margin auto
-		width 150px
-		height 150px
-		background var(--face)
-		border-radius 8px
-		opacity 0
-
-		> .icon
-			display flex
-			justify-content center
-			position absolute
-			top 0
-			right 0
-			left 0
-			bottom 0
-			width 5em
-			height 5em
-			margin auto
-			border .25em solid transparent
-			border-radius 50%
-			line-height 5em
-			cursor default
-			box-sizing content-box
-			user-select none
-			zoom normal
-			border-color #a5dc86
-
-			> .circle
-				position absolute
-				width 3.75em
-				height 7.5em
-				transform rotate(45deg)
-				border-radius 50%
-				background var(--face)
-
-				&.left
-					top -.4375em
-					left -2.0635em
-					transform rotate(-45deg)
-					transform-origin 3.75em 3.75em
-					border-radius 7.5em 0 0 7.5em
-
-				&.right
-					top -.6875em
-					left 1.875em
-					transform rotate(-45deg)
-					transform-origin 0 3.75em
-					border-radius 0 7.5em 7.5em 0
-					animation swal2-rotate-success-circular-line 4.25s ease-in
-
-			> .check
-				display block
-				position absolute
-				height .3125em
-				border-radius .125em
-				background-color #a5dc86
-				z-index 2
-
-				&.tip
-					top 2.875em
-					left .875em
-					width 1.5625em
-					transform rotate(45deg)
-					animation swal2-animate-success-line-tip .75s
-
-				&.long
-					top 2.375em
-					right .5em
-					width 2.9375em
-					transform rotate(-45deg)
-					animation swal2-animate-success-line-long .75s
-
-			> .fix
-				position absolute
-				top .5em
-				left 1.625em
-				width .4375em
-				height 5.625em
-				transform rotate(-45deg)
-				z-index 1
-				background var(--face)
-
-			> .ring
-				position absolute
-				top -.25em
-				left -.25em
-				width 100%
-				height 100%
-				border .25em solid rgba(165,220,134,.3)
-				border-radius 50%
-				z-index 2
-				box-sizing content-box
-</style>

src/client/app/common/views/components/password-settings.vue

@@ -25,12 +25,9 @@ export default Vue.extend({
 						type: 'password'
 					}).then(newPassword2 => {
 						if (newPassword !== newPassword2) {
-							this.$dialog({
+							this.$root.alert({
 								title: null,
-								text: this.$t('not-match'),
+								text: this.$t('not-match')
-								actions: [{
-									text: 'OK'
-								}]
 							});
 							return;
 						}

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

@@ -193,7 +193,7 @@ export default Vue.extend({
 				this.$store.state.i.bannerUrl = i.bannerUrl;
 
 				if (notify) {
-					this.$swal({
+					this.$root.alert({
 						type: 'success',
 						text: this.$t('saved')
 					});
@@ -223,6 +223,5 @@ export default Vue.extend({
 			width 72px
 			height 72px
 			margin auto
-			box-shadow 0 0 16px rgba(0, 0, 0, 0.5)
 
 </style>

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

@@ -14,6 +14,7 @@
 	<ui-button type="submit" :disabled="signing">{{ signing ? $t('signing-in') : $t('signin') }}</ui-button>
 	<p style="margin: 8px 0;"><a :href="`${apiUrl}/signin/twitter`">{{ $t('signin-with-twitter') }}</a></p>
 	<p style="margin: 8px 0;"><a :href="`${apiUrl}/signin/github`">{{ $t('signin-with-github') }}</a></p>
+	<p style="margin: 8px 0;"><a :href="`${apiUrl}/signin/discord`">{{ $t('signin-with-discord') /* TODO: Make these layouts better */ }}</a></p>
 </form>
 </template>
 

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

@@ -1,7 +1,7 @@
 <template>
 <div class="nicnklzforebnpfgasiypmpdaaglujqm">
 	<label>
-		<span>{{ $t('light-theme') }}</span>
+		<span><fa :icon="faSun"/> {{ $t('light-theme') }}</span>
 		<ui-select v-model="light" :placeholder="$t('light-theme')">
 			<optgroup :label="$t('light-themes')">
 				<option v-for="x in lightThemes" :value="x.id" :key="x.id">{{ x.name }}</option>
@@ -13,7 +13,7 @@
 	</label>
 
 	<label>
-		<span>{{ $t('dark-theme') }}</span>
+		<span><fa :icon="faMoon"/> {{ $t('dark-theme') }}</span>
 		<ui-select v-model="dark" :placeholder="$t('dark-theme')">
 			<optgroup :label="$t('dark-themes')">
 				<option v-for="x in darkThemes" :value="x.id" :key="x.id">{{ x.name }}</option>
@@ -104,6 +104,7 @@ import { Chrome } from 'vue-color';
 import * as uuid from 'uuid';
 import * as tinycolor from 'tinycolor2';
 import * as JSON5 from 'json5';
+import { faMoon, faSun } from '@fortawesome/free-regular-svg-icons';
 
 // 後方互換性のため
 function convertOldThemedefinition(t) {
@@ -135,7 +136,8 @@ export default Vue.extend({
 			myThemeDesc: '',
 			myThemePrimary: lightTheme.vars.primary,
 			myThemeSecondary: lightTheme.vars.secondary,
-			myThemeText: lightTheme.vars.text
+			myThemeText: lightTheme.vars.text,
+			faMoon, faSun
 		};
 	},
 
@@ -221,7 +223,7 @@ export default Vue.extend({
 			try {
 				theme = JSON5.parse(code);
 			} catch (e) {
-				this.$swal({
+				this.$root.alert({
 					type: 'error',
 					text: this.$t('invalid-theme')
 				});
@@ -234,7 +236,7 @@ export default Vue.extend({
 			}
 
 			if (theme.id == null) {
-				this.$swal({
+				this.$root.alert({
 					type: 'error',
 					text: this.$t('invalid-theme')
 				});
@@ -242,7 +244,7 @@ export default Vue.extend({
 			}
 
 			if (this.$store.state.device.themes.some(t => t.id == theme.id)) {
-				this.$swal({
+				this.$root.alert({
 					type: 'info',
 					text: this.$t('already-installed')
 				});
@@ -254,7 +256,7 @@ export default Vue.extend({
 				key: 'themes', value: themes
 			});
 
-			this.$swal({
+			this.$root.alert({
 				type: 'success',
 				text: this.$t('installed').replace('{}', theme.name)
 			});
@@ -267,7 +269,7 @@ export default Vue.extend({
 				key: 'themes', value: themes
 			});
 
-			this.$swal({
+			this.$root.alert({
 				type: 'info',
 				text: this.$t('uninstalled').replace('{}', theme.name)
 			});
@@ -304,7 +306,7 @@ export default Vue.extend({
 			const theme = this.myTheme;
 
 			if (theme.name == null || theme.name.trim() == '') {
-				this.$swal({
+				this.$root.alert({
 					type: 'warning',
 					text: this.$t('theme-name-required')
 				});
@@ -318,7 +320,7 @@ export default Vue.extend({
 				key: 'themes', value: themes
 			});
 
-			this.$swal({
+			this.$root.alert({
 				type: 'success',
 				text: this.$t('saved')
 			});

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

@@ -38,12 +38,24 @@ export default Vue.extend({
 			type: Boolean,
 			required: false,
 			default: false
-		}
+		},
+		autofocus: {
+			type: Boolean,
+			required: false,
+			default: false
+		},
 	},
 	data() {
 		return {
 			styl: 'fill'
 		};
+	},
+	mounted() {
+		if (this.autofocus) {
+			this.$nextTick(() => {
+				this.$el.focus();
+			});
+		}
 	}
 });
 </script>
@@ -57,6 +69,7 @@ export default Vue.extend({
 	text-align center
 	font-weight normal
 	font-size 16px
+	line-height 24px
 	border none
 	border-radius 6px
 	outline none
@@ -85,6 +98,7 @@ export default Vue.extend({
 	&.inline
 		display inline-block
 		width auto
+		min-width 100px
 
 	&.primary
 		font-weight bold

src/client/app/common/views/components/ui/horizon-group.vue

@@ -1,5 +1,5 @@
 <template>
-<div class="pfzekjfwkwvadvlujpdnnxfggqgqjoze" :class="{ inputs }">
+<div class="vnxwkwuf" :class="{ inputs, noGrow }">
 	<slot></slot>
 </div>
 </template>
@@ -15,21 +15,27 @@ export default Vue.extend({
 			type: Boolean,
 			required: false,
 			default: false
+		},
+		noGrow: {
+			type: Boolean,
+			required: false,
+			default: false
 		}
 	}
 });
 </script>
 
 <style lang="stylus" scoped>
-.pfzekjfwkwvadvlujpdnnxfggqgqjoze
+.vnxwkwuf
-	display flex
-
 	&.inputs
 		margin 32px 0
 
-	> *
+	&:not(.noGrow)
-		flex 1
+		display flex
 
-		&:not(:last-child)
+		> *
-			margin-right 16px
+			flex 1
+
+	> *:not(:last-child)
+		margin-right 16px
 </style>

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

@@ -57,17 +57,11 @@ export default Vue.extend({
 						return;
 					}
 
-					// Upload if the file didn't exist yet
-					const buf = new Uint8Array(e.target.result);
-					let bin = '';
-					// We use for-of loop instead of apply() to avoid RangeError
-					// SEE: https://stackoverflow.com/questions/9267899/arraybuffer-to-base64-encoded-string
-					for (const byte of buf) bin += String.fromCharCode(byte);
 					const ctx = {
 						id: id,
 						name: file.name || 'untitled',
 						progress: undefined,
-						img: 'data:*/*;base64,' + btoa(bin)
+						img: window.URL.createObjectURL(file)
 					};
 
 					this.uploads.push(ctx);

src/client/app/desktop/api/update-avatar.ts

@@ -8,12 +8,9 @@ export default ($root: any) => {
 
 		const regex = RegExp('\.(jpg|jpeg|png|gif|webp|bmp|tiff)$');
 		if (!regex.test(file.name) ) {
-			$root.$dialog({
+			$root.alert({
 				title: '%fa:info-circle% %i18n:desktop.invalid-filetype%',
-				text: null,
+				text: null
-				actions: [{
-					text: '%i18n:common.got-it%'
-				}]
 			});
 			return reject('invalid-filetype');
 		}
@@ -90,12 +87,9 @@ export default ($root: any) => {
 				value: i.avatarUrl
 			});
 
-			$root.$dialog({
+			$root.alert({
 				title: '%fa:info-circle% %i18n:desktop.avatar-updated%',
-				text: null,
+				text: null
-				actions: [{
-					text: '%i18n:common.got-it%'
-				}]
 			});
 
 			return i;

src/client/app/desktop/api/update-banner.ts

@@ -10,10 +10,7 @@ export default ($root: any) => {
 		if (!regex.test(file.name) ) {
 			$root.dialog({
 				title: '%fa:info-circle% %i18n:desktop.invalid-filetype%',
-				text: null,
+				text: null
-				actions: [{
-					text: '%i18n:common.got-it%'
-				}]
 			});
 			return reject('invalid-filetype');
 		}
@@ -90,12 +87,9 @@ export default ($root: any) => {
 				value: i.bannerUrl
 			});
 
-			$root.$dialog({
+			$root.alert({
 				title: '%fa:info-circle% %i18n:desktop.banner-updated%',
-				text: null,
+				text: null
-				actions: [{
-					text: '%i18n:common.got-it%'
-				}]
 			});
 
 			return i;

src/client/app/desktop/script.ts

@@ -34,7 +34,6 @@ import PostFormWindow from './views/components/post-form-window.vue';
 import RenoteFormWindow from './views/components/renote-form-window.vue';
 import MkChooseFileFromDriveWindow from './views/components/choose-file-from-drive-window.vue';
 import MkChooseFolderFromDriveWindow from './views/components/choose-folder-from-drive-window.vue';
-import Dialog from './views/components/dialog.vue';
 import InputDialog from './views/components/input-dialog.vue';
 import Notification from './views/components/ui-notification.vue';
 
@@ -114,21 +113,6 @@ init(async (launch) => {
 				});
 			},
 
-			$dialog(opts) {
-				return new Promise<string>((res, rej) => {
-					const o = opts || {};
-					const d = this.$root.new(Dialog, {
-						title: o.title,
-						text: o.text,
-						modal: o.modal,
-						buttons: o.actions
-					});
-					d.$once('clicked', id => {
-						res(id);
-					});
-				});
-			},
-
 			$input(opts) {
 				return new Promise<string>((res, rej) => {
 					const o = opts || {};

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

@@ -1,168 +0,0 @@
-<template>
-<div class="mk-dialog">
-	<div class="bg" ref="bg" @click="onBgClick"></div>
-	<div class="main" ref="main">
-		<header v-html="title" :class="$style.header"></header>
-		<div class="body" v-html="text"></div>
-		<div class="buttons">
-			<button v-for="button in buttons" @click="click(button)">{{ button.text }}</button>
-		</div>
-	</div>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import * as anime from 'animejs';
-
-export default Vue.extend({
-	props: {
-		title: {
-			type: String,
-			required: false
-		},
-		text: {
-			type: String,
-			required: true
-		},
-		buttons: {
-			type: Array,
-			default: () => {
-				return [{
-					text: 'OK'
-				}];
-			}
-		},
-		modal: {
-			type: Boolean,
-			default: false
-		}
-	},
-	mounted() {
-		this.$nextTick(() => {
-			(this.$refs.bg as any).style.pointerEvents = 'auto';
-			anime({
-				targets: this.$refs.bg,
-				opacity: 1,
-				duration: 100,
-				easing: 'linear'
-			});
-
-			anime({
-				targets: this.$refs.main,
-				opacity: 1,
-				scale: [1.2, 1],
-				duration: 300,
-				easing: [0, 0.5, 0.5, 1]
-			});
-		});
-	},
-	methods: {
-		click(button) {
-			this.$emit('clicked', button.id);
-			this.close();
-		},
-		close() {
-			(this.$refs.bg as any).style.pointerEvents = 'none';
-			anime({
-				targets: this.$refs.bg,
-				opacity: 0,
-				duration: 300,
-				easing: 'linear'
-			});
-
-			(this.$refs.main as any).style.pointerEvents = 'none';
-			anime({
-				targets: this.$refs.main,
-				opacity: 0,
-				scale: 0.8,
-				duration: 300,
-				easing: [ 0.5, -0.5, 1, 0.5 ],
-				complete: () => this.destroyDom()
-			});
-		},
-		onBgClick() {
-			if (!this.modal) {
-				this.close();
-			}
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.mk-dialog
-	> .bg
-		display block
-		position fixed
-		z-index 8192
-		top 0
-		left 0
-		width 100%
-		height 100%
-		background rgba(#000, 0.7)
-		opacity 0
-		pointer-events none
-
-	> .main
-		display block
-		position fixed
-		z-index 8192
-		top 20%
-		left 0
-		right 0
-		margin 0 auto 0 auto
-		padding 32px 42px
-		width 480px
-		background #fff
-		opacity 0
-
-		> .body
-			margin 1em 0
-			color #888
-
-		> .buttons
-			> button
-				display inline-block
-				float right
-				margin 0
-				padding 10px 10px
-				font-size 1.1em
-				font-weight normal
-				text-decoration none
-				color #888
-				background transparent
-				outline none
-				border none
-				border-radius 0
-				cursor pointer
-				transition color 0.1s ease
-
-				i
-					margin 0 0.375em
-
-				&:hover
-					color var(--primary)
-
-				&:active
-					color var(--primaryDarken10)
-					transition color 0s ease
-
-</style>
-
-<style lang="stylus" module>
-
-
-.header
-	margin 1em 0
-	color var(--primary)
-	// color #43A4EC
-	font-weight bold
-
-	&:empty
-		display none
-
-	> i
-		margin-right 0.5em
-
-</style>

src/client/app/desktop/views/components/drive.file.vue

@@ -170,12 +170,9 @@ export default Vue.extend({
 
 		copyUrl() {
 			copyToClipboard(this.file.url);
-			this.$dialog({
+			this.$root.alert({
 				title: this.$t('contextmenu.copied'),
-				text: this.$t('contextmenu.copied-url-to-clipboard'),
+				text: this.$t('contextmenu.copied-url-to-clipboard')
-				actions: [{
-					text: this.$t('@.ok')
-				}]
 			});
 		},
 

src/client/app/desktop/views/components/drive.folder.vue

@@ -155,12 +155,9 @@ export default Vue.extend({
 				}).catch(err => {
 					switch (err) {
 						case 'detected-circular-definition':
-							this.$dialog({
+							this.$root.alert({
 								title: this.$t('unable-to-process'),
-								text: this.$t('circular-reference-detected'),
+								text: this.$t('circular-reference-detected')
-								actions: [{
-									text: this.$t('@.ok')
-								}]
 							});
 							break;
 						default:

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

@@ -313,12 +313,9 @@ export default Vue.extend({
 				}).catch(err => {
 					switch (err) {
 						case 'detected-circular-definition':
-							this.$dialog({
+							this.$root.alert({
 								title: this.$t('unable-to-process'),
-								text: this.$t('circular-reference-detected'),
+								text: this.$t('circular-reference-detected')
-								actions: [{
-									text: this.$t('@.ok')
-								}]
 							});
 							break;
 						default:
@@ -343,12 +340,9 @@ export default Vue.extend({
 					folderId: this.folder ? this.folder.id : undefined
 				});
 
-				this.$dialog({
+				this.$root.alert({
 					title: this.$t('url-upload-requested'),
-					text: this.$t('may-take-time'),
+					text: this.$t('may-take-time')
-					actions: [{
-						text: this.$t('@.ok')
-					}]
 				});
 			});
 		},

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

@@ -186,12 +186,9 @@ export default Vue.extend({
 
 	methods: {
 		hint() {
-			this.$dialog({
+			this.$root.alert({
 				title: this.$t('@.customization-tips.title'),
-				text: this.$t('@.customization-tips.paragraph'),
+				text: this.$t('@.customization-tips.paragraph')
-				actions: [{
-					text: this.$t('@.customization-tips.gotit')
-				}]
 			});
 		},
 

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

@@ -20,14 +20,21 @@
 			<ui-card>
 				<div slot="title"><fa :icon="['fab', 'twitter']"/> {{ $t('twitter') }}</div>
 				<section>
-					<mk-twitter-setting/>
+					<x-twitter-setting/>
 				</section>
 			</ui-card>
 
 			<ui-card>
 				<div slot="title"><fa :icon="['fab', 'github']"/> {{ $t('github') }}</div>
 				<section>
-					<mk-github-setting/>
+					<x-github-setting/>
+				</section>
+			</ui-card>
+
+			<ui-card>
+				<div slot="title"><fa :icon="['fab', 'discord']"/> {{ $t('discord') }}</div>
+				<section>
+					<x-discord-setting/>
 				</section>
 			</ui-card>
 		</div>
@@ -292,6 +299,16 @@ import X2fa from './settings.2fa.vue';
 import XApps from './settings.apps.vue';
 import XSignins from './settings.signins.vue';
 import XTags from './settings.tags.vue';
+import XTwitterSetting from '../../../common/views/components/twitter-setting.vue';
+import XGithubSetting from '../../../common/views/components/github-setting.vue';
+import XDiscordSetting from '../../../common/views/components/discord-setting.vue';
+import XTheme from '../../../common/views/components/theme.vue';
+import XDriveSettings from '../../../common/views/components/drive-settings.vue';
+import XMuteAndBlock from '../../../common/views/components/mute-and-block.vue';
+import XPasswordSettings from '../../../common/views/components/password-settings.vue';
+import XProfileEditor from '../../../common/views/components/profile-editor.vue';
+import XApiSettings from '../../../common/views/components/api-settings.vue';
+
 import { url, langs, clientVersion as version } from '../../../config';
 import checkForUpdate from '../../../common/scripts/check-for-update';
 
@@ -302,12 +319,15 @@ export default Vue.extend({
 		XApps,
 		XSignins,
 		XTags,
-		XTheme: () => import('../../../common/views/components/theme.vue').then(m => m.default),
+		XTwitterSetting,
-		XDriveSettings: () => import('../../../common/views/components/drive-settings.vue').then(m => m.default),
+		XGithubSetting,
-		XMuteAndBlock: () => import('../../../common/views/components/mute-and-block.vue').then(m => m.default),
+		XDiscordSetting,
-		XPasswordSettings: () => import('../../../common/views/components/password-settings.vue').then(m => m.default),
+		XTheme,
-		XProfileEditor: () => import('../../../common/views/components/profile-editor.vue').then(m => m.default),
+		XDriveSettings,
-		XApiSettings: () => import('../../../common/views/components/api-settings.vue').then(m => m.default),
+		XMuteAndBlock,
+		XPasswordSettings,
+		XProfileEditor,
+		XApiSettings,
 	},
 	props: {
 		initialPage: {
@@ -549,12 +569,12 @@ export default Vue.extend({
 				this.checkingForUpdate = false;
 				this.latestVersion = newer;
 				if (newer == null) {
-					this.$dialog({
+					this.$root.alert({
 						title: this.$t('no-updates'),
 						text: this.$t('no-updates-desc')
 					});
 				} else {
-					this.$dialog({
+					this.$root.alert({
 						title: this.$t('update-available'),
 						text: this.$t('update-available-desc')
 					});
@@ -563,7 +583,7 @@ export default Vue.extend({
 		},
 		clean() {
 			localStorage.clear();
-			this.$dialog({
+			this.$root.alert({
 				title: this.$t('cache-cleared'),
 				text: this.$t('cache-cleared-desc')
 			});

src/client/app/desktop/views/components/ui.header.account.vue

@@ -58,7 +58,7 @@
 						<i><fa icon="angle-right"/></i>
 					</p>
 				</li>
-				<li v-if="$store.state.i.isAdmin">
+				<li v-if="$store.state.i.isAdmin || $store.state.i.isModerator">
 					<a href="/admin">
 						<i><fa icon="terminal"/></i>
 						<span>{{ $t('admin') }}</span>

src/client/app/desktop/views/pages/deck/deck.user-column.vue

@@ -87,7 +87,6 @@ import XNotes from './deck.notes.vue';
 import XNote from '../../components/note.vue';
 import Menu from '../../../../common/views/components/menu.vue';
 import MkUserListsWindow from '../../components/user-lists-window.vue';
-import Ok from '../../../../common/views/components/ok.vue';
 import { concat } from '../../../../../../prelude/array';
 import * as ApexCharts from 'apexcharts';
 
@@ -308,7 +307,10 @@ export default Vue.extend({
 							listId: list.id,
 							userId: this.user.id
 						});
-						this.$root.new(Ok);
+						this.$root.alert({
+							type: 'success',
+							splash: true
+						});
 					});
 				}
 			}];

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

@@ -0,0 +1,26 @@
+<template>
+<div class="lkafjvabenanajk17kwqpsatoushincb">
+	<span><fa :icon="['fab', 'discord']"/><a :href="`https://discordapp.com/users/${user.discord.id}`" target="_blank">@{{ user.discord.username }}#{{ user.discord.discriminator }}</a></span>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: ['user']
+});
+</script>
+
+<style lang="stylus" scoped>
+.lkafjvabenanajk17kwqpsatoushincb
+	padding 32px
+	background #7289da
+	border-radius 6px
+	color #fff
+
+	a
+		margin-left 8px
+		color #fff
+
+</style>

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

@@ -14,8 +14,8 @@
 			<span v-else><fa :icon="['far', 'eye-slash']"/> {{ $t('mute') }}</span>
 		</ui-button>
 		<ui-button @click="user.isBlocking ? unblock() : block()" v-if="$store.state.i.id != user.id">
-			<span v-if="user.isBlocking"><fa icon="user"/> {{ $t('unblock') }}</span>
+			<span v-if="user.isBlocking"><fa icon="ban"/> {{ $t('unblock') }}</span>
-			<span v-else><fa icon="user-slash"/> {{ $t('block') }}</span>
+			<span v-else><fa icon="ban"/> {{ $t('block') }}</span>
 		</ui-button>
 		<ui-button @click="list"><fa icon="list"/> {{ $t('push-to-a-list') }}</ui-button>
 	</div>
@@ -73,13 +73,20 @@ export default Vue.extend({
 		},
 
 		block() {
-			if (!window.confirm(this.$t('block-confirm'))) return;
+			this.$root.alert({
-			this.$root.api('blocking/create', {
+				type: 'warning',
-				userId: this.user.id
+				text: this.$t('block-confirm'),
-			}).then(() => {
+				showCancelButton: true
-				this.user.isBlocking = true;
+			}).then(res => {
-			}, () => {
+				if (!res) return;
-				alert('error');
+
+				this.$root.api('blocking/create', {
+					userId: this.user.id
+				}).then(() => {
+					this.user.isBlocking = true;
+				}, () => {
+					alert('error');
+				});
 			});
 		},
 
@@ -101,7 +108,7 @@ export default Vue.extend({
 					listId: list.id,
 					userId: this.user.id
 				});
-				this.$dialog({
+				this.$root.alert({
 					title: 'Done!',
 					text: this.$t('list-pushed').replace('{user}', this.user.name).replace('{list}', list.title)
 				});

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

@@ -14,6 +14,7 @@
 				<x-profile :user="user"/>
 				<x-twitter :user="user" v-if="!user.host && user.twitter"/>
 				<x-github :user="user" v-if="!user.host && user.github"/>
+				<x-discord :user="user" v-if="!user.host && user.discord"/>
 				<mk-calendar @chosen="warp" :start="new Date(user.createdAt)"/>
 				<mk-activity :user="user"/>
 				<x-photos :user="user"/>
@@ -39,6 +40,7 @@ import XFollowersYouKnow from './user.followers-you-know.vue';
 import XFriends from './user.friends.vue';
 import XTwitter from './user.twitter.vue';
 import XGithub from './user.github.vue'; // ?MEM: Don't fix the intentional typo. (XGitHub -> `<x-git-hub>`)
+import XDiscord from './user.discord.vue';
 
 export default Vue.extend({
 	i18n: i18n(),
@@ -50,7 +52,8 @@ export default Vue.extend({
 		XFollowersYouKnow,
 		XFriends,
 		XTwitter,
-		XGithub // ?MEM: Don't fix the intentional typo. (see L41)
+		XGithub, // ?MEM: Don't fix the intentional typo. (see L41)
+		XDiscord
 	},
 	data() {
 		return {

src/client/app/init.ts

@@ -7,7 +7,6 @@ import Vuex from 'vuex';
 import VueRouter from 'vue-router';
 import VAnimateCss from 'v-animate-css';
 import VModal from 'vue-js-modal';
-import VueSweetalert2 from 'vue-sweetalert2';
 import VueI18n from 'vue-i18n';
 
 import VueHotkey from './common/hotkey';
@@ -16,6 +15,7 @@ import checkForUpdate from './common/scripts/check-for-update';
 import MiOS from './mios';
 import { clientVersion as version, codename, lang } from './config';
 import { builtinThemes, lightTheme, applyTheme } from './theme';
+import Alert from './common/views/components/alert.vue';
 
 if (localStorage.getItem('theme') == null) {
 	applyTheme(lightTheme);
@@ -111,7 +111,13 @@ import {
 	faServer,
 	faExclamationCircle,
 	faSpinner,
-	faBroadcastTower
+	faBroadcastTower,
+	faChartLine,
+	faEllipsisV,
+	faStickyNote,
+	faUserPlus,
+	faExternalLinkSquareAlt,
+	faSync,
 } from '@fortawesome/free-solid-svg-icons';
 
 import {
@@ -137,6 +143,7 @@ import {
 import {
 	faTwitter as fabTwitter,
 	faGithub as fabGithub,
+	faDiscord as fabDiscord
 } from '@fortawesome/free-brands-svg-icons';
 import i18n from './i18n';
 
@@ -227,6 +234,12 @@ library.add(
 	faExclamationCircle,
 	faSpinner,
 	faBroadcastTower,
+	faChartLine,
+	faEllipsisV,
+	faStickyNote,
+	faUserPlus,
+	faExternalLinkSquareAlt,
+	faSync,
 
 	farBell,
 	farEnvelope,
@@ -247,7 +260,8 @@ library.add(
 	farHdd,
 
 	fabTwitter,
-	fabGithub
+	fabGithub,
+	fabDiscord
 );
 //#endregion
 
@@ -256,7 +270,6 @@ Vue.use(VueRouter);
 Vue.use(VAnimateCss);
 Vue.use(VModal);
 Vue.use(VueHotkey);
-Vue.use(VueSweetalert2);
 Vue.use(VueI18n);
 
 Vue.component('fa', FontAwesomeIcon);
@@ -428,6 +441,13 @@ export default (callback: (launch: (router: VueRouter) => [Vue, MiOS]) => void,
 						document.body.appendChild(x.$el);
 						return x;
 					},
+					alert(opts) {
+						return new Promise((res) => {
+							const vm = this.new(Alert, opts);
+							vm.$once('ok', () => res(true));
+							vm.$once('cancel', () => res(false));
+						});
+					}
 				},
 				router,
 				render: createEl => createEl(App)

src/client/app/mios.ts

@@ -172,7 +172,7 @@ export default class MiOS extends EventEmitter {
 			callback();
 
 			// Init service worker
-			if (this.shouldRegisterSw) this.registerSw();
+			//if (this.shouldRegisterSw) this.registerSw();
 		};
 
 		// キャッシュがあったとき
@@ -365,7 +365,7 @@ export default class MiOS extends EventEmitter {
 		});
 
 		// The path of service worker script
-		const sw = `/sw.${version}.${lang}.js`;
+		const sw = `/sw.${version}.js`;
 
 		// Register service worker
 		navigator.serviceWorker.register(sw).then(registration => {

src/client/app/mobile/script.ts

@@ -35,7 +35,6 @@ import MkFollow from '../common/views/pages/follow.vue';
 import PostForm from './views/components/post-form-dialog.vue';
 import FileChooser from './views/components/drive-file-chooser.vue';
 import FolderChooser from './views/components/drive-folder-chooser.vue';
-import Dialog from './views/components/dialog.vue';
 
 /**
  * init
@@ -99,21 +98,6 @@ init((launch) => {
 				});
 			},
 
-			$dialog(opts) {
-				return new Promise<string>((res, rej) => {
-					const o = opts || {};
-					const d = this.$root.new(Dialog, {
-						title: o.title,
-						text: o.text,
-						modal: o.modal,
-						buttons: o.actions
-					});
-					d.$once('clicked', id => {
-						res(id);
-					});
-				});
-			},
-
 			$notify(message) {
 				alert(message);
 			}

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

@@ -1,167 +0,0 @@
-<template>
-<div class="mk-dialog">
-	<div class="bg" ref="bg" @click="onBgClick"></div>
-	<div class="main" ref="main">
-		<header v-html="title" :class="$style.header"></header>
-		<div class="body" v-html="text"></div>
-		<div class="buttons">
-			<button v-for="button in buttons" @click="click(button)">{{ button.text }}</button>
-		</div>
-	</div>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import * as anime from 'animejs';
-
-export default Vue.extend({
-	props: {
-		title: {
-			type: String,
-			required: false
-		},
-		text: {
-			type: String,
-			required: true
-		},
-		buttons: {
-			type: Array,
-			default: () => {
-				return [{
-					text: 'OK'
-				}];
-			}
-		},
-		modal: {
-			type: Boolean,
-			default: false
-		}
-	},
-	mounted() {
-		this.$nextTick(() => {
-			(this.$refs.bg as any).style.pointerEvents = 'auto';
-			anime({
-				targets: this.$refs.bg,
-				opacity: 1,
-				duration: 100,
-				easing: 'linear'
-			});
-
-			anime({
-				targets: this.$refs.main,
-				opacity: 1,
-				scale: [1.2, 1],
-				duration: 300,
-				easing: [0, 0.5, 0.5, 1]
-			});
-		});
-	},
-	methods: {
-		click(button) {
-			this.$emit('clicked', button.id);
-			this.close();
-		},
-		close() {
-			(this.$refs.bg as any).style.pointerEvents = 'none';
-			anime({
-				targets: this.$refs.bg,
-				opacity: 0,
-				duration: 300,
-				easing: 'linear'
-			});
-
-			(this.$refs.main as any).style.pointerEvents = 'none';
-			anime({
-				targets: this.$refs.main,
-				opacity: 0,
-				scale: 0.8,
-				duration: 300,
-				easing: [ 0.5, -0.5, 1, 0.5 ],
-				complete: () => this.destroyDom()
-			});
-		},
-		onBgClick() {
-			if (!this.modal) {
-				this.close();
-			}
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.mk-dialog
-	> .bg
-		display block
-		position fixed
-		z-index 8192
-		top 0
-		left 0
-		width 100%
-		height 100%
-		background rgba(#000, 0.7)
-		opacity 0
-		pointer-events none
-
-	> .main
-		display block
-		position fixed
-		z-index 8192
-		top 20%
-		left 0
-		right 0
-		margin 0 auto 0 auto
-		padding 16px
-		width calc(100% - 32px)
-		max-width 300px
-		background #fff
-		opacity 0
-
-		> .body
-			margin 1em 0
-			color #888
-
-		> .buttons
-			> button
-				display inline-block
-				float right
-				margin 0
-				padding 0 10px
-				font-size 1.1em
-				font-weight normal
-				text-decoration none
-				color #888
-				background transparent
-				outline none
-				border none
-				border-radius 0
-				cursor pointer
-				transition color 0.1s ease
-
-				i
-					margin 0 0.375em
-
-				&:hover
-					color var(--primary)
-
-				&:active
-					color var(--primaryDarken10)
-					transition color 0s ease
-
-</style>
-
-<style lang="stylus" module>
-.header
-	margin 0 0 1em 0
-	color var(--primary)
-	// color #43A4EC
-	font-weight bold
-
-	&:empty
-		display none
-
-	> i
-		margin-right 0.5em
-
-</style>

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

@@ -30,7 +30,7 @@
 				<ul>
 					<li><a @click="search"><i><fa icon="search"/></i>{{ $t('search') }}<i><fa icon="angle-right"/></i></a></li>
 					<li><router-link to="/i/settings" :data-active="$route.name == 'settings'"><i><fa icon="cog"/></i>{{ $t('settings') }}<i><fa icon="angle-right"/></i></router-link></li>
-					<li v-if="$store.getters.isSignedIn && $store.state.i.isAdmin"><a href="/admin"><i><fa icon="terminal"/></i><span>{{ $t('admin') }}</span><i><fa icon="angle-right"/></i></a></li>
+					<li v-if="$store.getters.isSignedIn && ($store.state.i.isAdmin || $store.state.i.isModerator)"><a href="/admin"><i><fa icon="terminal"/></i><span>{{ $t('admin') }}</span><i><fa icon="angle-right"/></i></a></li>
 					<li @click="dark"><p><template v-if="$store.state.device.darkmode"><i><fa icon="moon"/></i></template><template v-else><i><fa :icon="['far', 'moon']"/></i></template><span>{{ $t('darkmode') }}</span></p></li>
 				</ul>
 			</div>

src/client/app/mobile/views/components/widget-container.vue

@@ -60,6 +60,6 @@ export default Vue.extend({
 			width 42px
 			height 100%
 			font-size 15px
-			color #465258
+			color var(--faceTextButton)
 
 </style>

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

@@ -23,10 +23,15 @@ export default Vue.extend({
 	},
 	methods: {
 		fn() {
-			const ok = window.confirm(this.$t('read-all'));
+			this.$root.alert({
-			if (!ok) return;
+				type: 'warning',
+				text: this.$t('read-all'),
+				showCancelButton: true
+			}).then(res => {
+				if (!res) return;
 
-			this.$root.api('notifications/mark_all_as_read');
+				this.$root.api('notifications/mark_all_as_read');
+			});
 		},
 		onFetched() {
 			Progress.done();

src/client/app/mobile/views/pages/settings.vue

@@ -140,6 +140,19 @@
 				</section>
 			</ui-card>
 
+			<ui-card>
+				<div slot="title"><fa :icon="['fab', 'discord']"/> {{ $t('discord') }}</div>
+
+				<section>
+					<p class="account" v-if="$store.state.i.discord"><a :href="`https://discordapp.com/users/${$store.state.i.discord.id}`" target="_blank">@{{ $store.state.i.discord.username }}#{{ $store.state.i.discord.discriminator }}</a></p>
+					<p>
+						<a :href="`${apiUrl}/connect/discord`" target="_blank">{{ $store.state.i.discord ? this.$t('discord-reconnect') : this.$t('discord-connect') }}</a>
+						<span v-if="$store.state.i.discord"> or </span>
+						<a :href="`${apiUrl}/disconnect/discord`" target="_blank" v-if="$store.state.i.discord">{{ $t('discord-disconnect') }}</a>
+					</p>
+				</section>
+			</ui-card>
+
 			<x-api-settings />
 
 			<ui-card>
@@ -179,17 +192,23 @@ import Vue from 'vue';
 import i18n from '../../../i18n';
 import { apiUrl, clientVersion as version, codename, langs } from '../../../config';
 import checkForUpdate from '../../../common/scripts/check-for-update';
+import XTheme from '../../../common/views/components/theme.vue';
+import XDriveSettings from '../../../common/views/components/drive-settings.vue';
+import XMuteAndBlock from '../../../common/views/components/mute-and-block.vue';
+import XPasswordSettings from '../../../common/views/components/password-settings.vue';
+import XProfileEditor from '../../../common/views/components/profile-editor.vue';
+import XApiSettings from '../../../common/views/components/api-settings.vue';
 
 export default Vue.extend({
 	i18n: i18n('mobile/views/pages/settings.vue'),
 
 	components: {
-		XTheme: () => import('../../../common/views/components/theme.vue').then(m => m.default),
+		XTheme,
-		XDriveSettings: () => import('../../../common/views/components/drive-settings.vue').then(m => m.default),
+		XDriveSettings,
-		XMuteAndBlock: () => import('../../../common/views/components/mute-and-block.vue').then(m => m.default),
+		XMuteAndBlock,
-		XPasswordSettings: () => import('../../../common/views/components/password-settings.vue').then(m => m.default),
+		XPasswordSettings,
-		XProfileEditor: () => import('../../../common/views/components/profile-editor.vue').then(m => m.default),
+		XProfileEditor,
-		XApiSettings: () => import('../../../common/views/components/api-settings.vue').then(m => m.default),
+		XApiSettings,
 	},
 
 	data() {
@@ -360,12 +379,12 @@ export default Vue.extend({
 				this.checkingForUpdate = false;
 				this.latestVersion = newer;
 				if (newer == null) {
-					this.$dialog({
+					this.$root.alert({
 						title: this.$t('no-updates'),
 						text: this.$t('no-updates-desc')
 					});
 				} else {
-					this.$dialog({
+					this.$root.alert({
 						title: this.$t('update-available'),
 						text: this.$t('update-available-desc')
 					});

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

@@ -138,7 +138,7 @@ export default Vue.extend({
 					}
 				}
 			}, {
-				icon: this.user.isBlocking ? ['fas', 'user'] : ['fas', 'user-slash'],
+				icon: 'ban',
 				text: this.user.isBlocking ? this.$t('unblock') : this.$t('block'),
 				action: () => {
 					if (this.user.isBlocking) {

src/misc/fetch-meta.ts

@@ -15,6 +15,7 @@ const defaultMeta: any = {
 	maxNoteTextLength: 1000,
 	enableTwitterIntegration: false,
 	enableGithubIntegration: false,
+	enableDiscordIntegration: false
 };
 
 export default async function(): Promise<IMeta> {

src/models/meta.ts

@@ -191,4 +191,8 @@ export type IMeta = {
 	enableGithubIntegration?: boolean;
 	githubClientId?: string;
 	githubClientSecret?: string;
+
+	enableDiscordIntegration?: boolean;
+	discordClientId?: string;
+	discordClientSecret?: string;
 };

src/models/user.ts

@@ -88,6 +88,14 @@ export interface ILocalUser extends IUserBase {
 		id: string;
 		login: string;
 	};
+	discord: {
+		accessToken: string;
+		refreshToken: string;
+		expiresDate: number;
+		id: string;
+		username: string;
+		discriminator: string;
+	};
 	line: {
 		userId: string;
 	};
@@ -99,6 +107,7 @@ export interface ILocalUser extends IUserBase {
 	lastUsedAt: Date;
 	isCat: boolean;
 	isAdmin?: boolean;
+	isModerator?: boolean;
 	isVerified?: boolean;
 	twoFactorSecret: string;
 	twoFactorEnabled: boolean;
@@ -125,6 +134,7 @@ export interface IRemoteUser extends IUserBase {
 	};
 	updatedAt: Date;
 	isAdmin: false;
+	isModerator: false;
 }
 
 export type IUser = ILocalUser | IRemoteUser;
@@ -289,6 +299,11 @@ export const pack = (
 		if (_user.github) {
 			delete _user.github.accessToken;
 		}
+		if (_user.discord) {
+			delete _user.discord.accessToken;
+			delete _user.discord.refreshToken;
+			delete _user.discord.expiresDate;
+		}
 		delete _user.line;
 
 		// Visible via only the official client

src/server/api/call.ts

@@ -29,6 +29,10 @@ export default (endpoint: string, user: IUser, app: IApp, data: any, file?: any)
 		return rej('YOU_ARE_NOT_ADMIN');
 	}
 
+	if (ep.meta.requireModerator && !user.isAdmin && !user.isModerator) {
+		return rej('YOU_ARE_NOT_MODERATOR');
+	}
+
 	if (app && ep.meta.kind && !app.permission.some(p => p === ep.meta.kind)) {
 		return rej('PERMISSION_DENIED');
 	}

src/server/api/endpoints.ts

@@ -30,6 +30,11 @@ export interface IEndpointMeta {
 	 */
 	requireAdmin?: boolean;
 
+	/**
+	 * 管理者またはモデレーターのみ使えるエンドポイントか否か
+	 */
+	requireModerator?: boolean;
+
 	/**
 	 * エンドポイントのリミテーションに関するやつ
 	 * 省略した場合はリミテーションは無いものとして解釈されます。

src/server/api/endpoints/admin/emoji/add.ts

@@ -8,7 +8,7 @@ export const meta = {
 	},
 
 	requireCredential: true,
-	requireAdmin: true,
+	requireModerator: true,
 
 	params: {
 		name: {

src/server/api/endpoints/admin/emoji/list.ts

@@ -8,7 +8,7 @@ export const meta = {
 	},
 
 	requireCredential: true,
-	requireAdmin: true,
+	requireModerator: true,
 
 	params: {
 		host: {

src/server/api/endpoints/admin/emoji/remove.ts

@@ -9,7 +9,7 @@ export const meta = {
 	},
 
 	requireCredential: true,
-	requireAdmin: true,
+	requireModerator: true,
 
 	params: {
 		id: {

src/server/api/endpoints/admin/emoji/update.ts

@@ -9,7 +9,7 @@ export const meta = {
 	},
 
 	requireCredential: true,
-	requireAdmin: true,
+	requireModerator: true,
 
 	params: {
 		id: {

src/server/api/endpoints/admin/invite.ts

@@ -8,7 +8,7 @@ export const meta = {
 	},
 
 	requireCredential: true,
-	requireAdmin: true,
+	requireModerator: true,
 
 	params: {}
 };

src/server/api/endpoints/admin/moderators/add.ts

@@ -0,0 +1,45 @@
+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': '指定したユーザーをモデレーターにします。',
+		'en-US': 'Mark a user as moderator.'
+	},
+
+	requireCredential: true,
+	requireAdmin: true,
+
+	params: {
+		userId: {
+			validator: $.type(ID),
+			transform: transform,
+			desc: {
+				'ja-JP': '対象のユーザーID',
+				'en-US': 'The user ID'
+			}
+		},
+	}
+};
+
+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');
+	}
+
+	await User.update({
+		_id: user._id
+	}, {
+		$set: {
+			isModerator: true
+		}
+	});
+
+	res();
+}));

src/server/api/endpoints/admin/moderators/remove.ts

@@ -0,0 +1,45 @@
+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': '指定したユーザーをモデレーター解除します。',
+		'en-US': 'Unmark a user as moderator.'
+	},
+
+	requireCredential: true,
+	requireAdmin: true,
+
+	params: {
+		userId: {
+			validator: $.type(ID),
+			transform: transform,
+			desc: {
+				'ja-JP': '対象のユーザーID',
+				'en-US': 'The user ID'
+			}
+		},
+	}
+};
+
+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');
+	}
+
+	await User.update({
+		_id: user._id
+	}, {
+		$set: {
+			isModerator: false
+		}
+	});
+
+	res();
+}));

src/server/api/endpoints/admin/suspend-user.ts

@@ -10,7 +10,7 @@ export const meta = {
 	},
 
 	requireCredential: true,
-	requireAdmin: true,
+	requireModerator: true,
 
 	params: {
 		userId: {

src/server/api/endpoints/admin/unsuspend-user.ts

@@ -10,7 +10,7 @@ export const meta = {
 	},
 
 	requireCredential: true,
-	requireAdmin: true,
+	requireModerator: true,
 
 	params: {
 		userId: {

src/server/api/endpoints/admin/unverify-user.ts

@@ -10,7 +10,7 @@ export const meta = {
 	},
 
 	requireCredential: true,
-	requireAdmin: true,
+	requireModerator: true,
 
 	params: {
 		userId: {

src/server/api/endpoints/admin/update-meta.ts

@@ -8,7 +8,7 @@ export const meta = {
 	},
 
 	requireCredential: true,
-	requireAdmin: true,
+	requireModerator: true,
 
 	params: {
 		broadcasts: {
@@ -177,9 +177,30 @@ export const meta = {
 		githubClientSecret: {
 			validator: $.str.optional.nullable,
 			desc: {
-				'ja-JP': 'GitHubアプリのClient secret'
+				'ja-JP': 'GitHubアプリのClient Secret'
 			}
 		},
+
+		enableDiscordIntegration: {
+			validator: $.bool.optional,
+			desc: {
+				'ja-JP': 'Discord連携機能を有効にするか否か'
+			}
+		},
+
+		discordClientId: {
+			validator: $.str.optional.nullable,
+			desc: {
+				'ja-JP': 'DiscordアプリのClient ID'
+			}
+		},
+
+		discordClientSecret: {
+			validator: $.str.optional.nullable,
+			desc: {
+				'ja-JP': 'DiscordアプリのClient Secret'
+			}
+		}
 	}
 };
 
@@ -282,6 +303,18 @@ export default define(meta, (ps) => new Promise(async (res, rej) => {
 		set.githubClientSecret = ps.githubClientSecret;
 	}
 
+	if (ps.enableDiscordIntegration !== undefined) {
+		set.enableDiscordIntegration = ps.enableDiscordIntegration;
+	}
+
+	if (ps.discordClientId !== undefined) {
+		set.discordClientId = ps.discordClientId;
+	}
+
+	if (ps.discordClientSecret !== undefined) {
+		set.discordClientSecret = ps.discordClientSecret;
+	}
+
 	await Meta.update({}, {
 		$set: set
 	}, { upsert: true });

src/server/api/endpoints/admin/verify-user.ts

@@ -10,7 +10,7 @@ export const meta = {
 	},
 
 	requireCredential: true,
-	requireAdmin: true,
+	requireModerator: true,
 
 	params: {
 		userId: {

src/server/api/endpoints/instances.ts

@@ -0,0 +1,51 @@
+import $ from 'cafy';
+import define from '../define';
+import Instance from '../../../models/instance';
+
+export const meta = {
+	requireCredential: false,
+
+	params: {
+		limit: {
+			validator: $.num.optional.range(1, 100),
+			default: 30
+		},
+
+		offset: {
+			validator: $.num.optional.min(0),
+			default: 0
+		},
+
+		sort: {
+			validator: $.str.optional.or('+notes|-notes'),
+		}
+	}
+};
+
+export default define(meta, (ps, me) => new Promise(async (res, rej) => {
+	let _sort;
+	if (ps.sort) {
+		if (ps.sort == '+notes') {
+			_sort = {
+				notesCount: -1
+			};
+		} else if (ps.sort == '-notes') {
+			_sort = {
+				notesCount: 1
+			};
+		}
+	} else {
+		_sort = {
+			_id: -1
+		};
+	}
+
+	const instances = await Instance
+		.find({}, {
+			limit: ps.limit,
+			sort: _sort,
+			skip: ps.offset
+		});
+
+	res(instances);
+}));

src/server/api/endpoints/meta.ts

@@ -79,12 +79,13 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 			objectStorage: config.drive && config.drive.storage === 'minio',
 			twitter: instance.enableTwitterIntegration,
 			github: instance.enableGithubIntegration,
+			discord: instance.enableDiscordIntegration,
 			serviceWorker: config.sw ? true : false,
 			userRecommendation: config.user_recommendation ? config.user_recommendation : {}
 		};
 	}
 
-	if (me && me.isAdmin) {
+	if (me && (me.isAdmin || me.isModerator)) {
 		response.hidedTags = instance.hidedTags;
 		response.recaptchaSecretKey = instance.recaptchaSecretKey;
 		response.proxyAccount = instance.proxyAccount;
@@ -94,6 +95,9 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 		response.enableGithubIntegration = instance.enableGithubIntegration;
 		response.githubClientId = instance.githubClientId;
 		response.githubClientSecret = instance.githubClientSecret;
+		response.enableDiscordIntegration = instance.enableDiscordIntegration;
+		response.discordClientId = instance.discordClientId;
+		response.discordClientSecret = instance.discordClientSecret;
 	}
 
 	res(response);

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

@@ -38,7 +38,7 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => {
 		return rej('note not found');
 	}
 
-	if (!user.isAdmin && !note.userId.equals(user._id)) {
+	if (!user.isAdmin && !user.isModerator && !note.userId.equals(user._id)) {
 		return rej('access denied');
 	}
 

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

@@ -180,6 +180,8 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 		query.createdAt = {
 			$lt: new Date(ps.untilDate)
 		};
+	} else {
+		sort._id = -1;
 	}
 
 	if (!ps.includeReplies) {

src/server/api/index.ts

@@ -43,6 +43,7 @@ endpoints.forEach(endpoint => endpoint.meta.requireFile
 router.post('/signup', require('./private/signup').default);
 router.post('/signin', require('./private/signin').default);
 
+router.use(require('./service/discord').routes());
 router.use(require('./service/github').routes());
 router.use(require('./service/github-bot').routes());
 router.use(require('./service/twitter').routes());

src/server/api/service/discord.ts

@@ -0,0 +1,306 @@
+import * as Koa from 'koa';
+import * as Router from 'koa-router';
+import * as request from 'request';
+import { OAuth2 } from 'oauth';
+import User, { pack, ILocalUser } from '../../../models/user';
+import config from '../../../config';
+import { publishMainStream } from '../../../stream';
+import redis from '../../../db/redis';
+import uuid = require('uuid');
+import signin from '../common/signin';
+import fetchMeta from '../../../misc/fetch-meta';
+
+function getUserToken(ctx: Koa.Context) {
+	return ((ctx.headers['cookie'] || '').match(/i=(!\w+)/) || [null, null])[1];
+}
+
+function compareOrigin(ctx: Koa.Context) {
+	function normalizeUrl(url: string) {
+		return url ? url.endsWith('/') ? url.substr(0, url.length - 1) : url : '';
+	}
+
+	const referer = ctx.headers['referer'];
+
+	return (normalizeUrl(referer) == normalizeUrl(config.url));
+}
+
+// Init router
+const router = new Router();
+
+router.get('/disconnect/discord', async ctx => {
+	if (!compareOrigin(ctx)) {
+		ctx.throw(400, 'invalid origin');
+		return;
+	}
+
+	const userToken = getUserToken(ctx);
+	if (!userToken) {
+		ctx.throw(400, 'signin required');
+		return;
+	}
+
+	const user = await User.findOneAndUpdate({
+		host: null,
+		'token': userToken
+	}, {
+		$set: {
+			'discord': null
+		}
+	});
+
+	ctx.body = `Discordの連携を解除しました :v:`;
+
+	// Publish i updated event
+	publishMainStream(user._id, 'meUpdated', await pack(user, user, {
+		detail: true,
+		includeSecrets: true
+	}));
+});
+
+async function getOAuth2() {
+	const meta = await fetchMeta();
+
+	if (meta.enableDiscordIntegration) {
+		return new OAuth2(
+			meta.discordClientId,
+			meta.discordClientSecret,
+			'https://discordapp.com/',
+			'api/oauth2/authorize',
+			'api/oauth2/token');
+	} else {
+		return null;
+	}
+}
+
+router.get('/connect/discord', async ctx => {
+	if (!compareOrigin(ctx)) {
+		ctx.throw(400, 'invalid origin');
+		return;
+	}
+
+	const userToken = getUserToken(ctx);
+	if (!userToken) {
+		ctx.throw(400, 'signin required');
+		return;
+	}
+
+	const params = {
+		redirect_uri: `${config.url}/api/dc/cb`,
+		scope: ['identify'],
+		state: uuid(),
+		response_type: 'code'
+	};
+
+	redis.set(userToken, JSON.stringify(params));
+
+	const oauth2 = await getOAuth2();
+	ctx.redirect(oauth2.getAuthorizeUrl(params));
+});
+
+router.get('/signin/discord', async ctx => {
+	const sessid = uuid();
+
+	const params = {
+		redirect_uri: `${config.url}/api/dc/cb`,
+		scope: ['identify'],
+		state: uuid(),
+		response_type: 'code'
+	};
+
+	const expires = 1000 * 60 * 60; // 1h
+	ctx.cookies.set('signin_with_discord_session_id', sessid, {
+		path: '/',
+		domain: config.host,
+		secure: config.url.startsWith('https'),
+		httpOnly: true,
+		expires: new Date(Date.now() + expires),
+		maxAge: expires
+	});
+
+	redis.set(sessid, JSON.stringify(params));
+
+	const oauth2 = await getOAuth2();
+	ctx.redirect(oauth2.getAuthorizeUrl(params));
+});
+
+router.get('/dc/cb', async ctx => {
+	const userToken = getUserToken(ctx);
+
+	const oauth2 = await getOAuth2();
+
+	if (!userToken) {
+		const sessid = ctx.cookies.get('signin_with_discord_session_id');
+
+		if (!sessid) {
+			ctx.throw(400, 'invalid session');
+			return;
+		}
+
+		const code = ctx.query.code;
+
+		if (!code) {
+			ctx.throw(400, 'invalid session');
+			return;
+		}
+
+		const { redirect_uri, state } = await new Promise<any>((res, rej) => {
+			redis.get(sessid, async (_, state) => {
+				res(JSON.parse(state));
+			});
+		});
+
+		if (ctx.query.state !== state) {
+			ctx.throw(400, 'invalid session');
+			return;
+		}
+
+		const { accessToken, refreshToken, expiresDate } = await new Promise<any>((res, rej) =>
+			oauth2.getOAuthAccessToken(
+				code,
+				{
+					grant_type: 'authorization_code',
+					redirect_uri
+				},
+				(err, accessToken, refreshToken, result) => {
+					if (err)
+						rej(err);
+					else if (result.error)
+						rej(result.error);
+					else
+					res({
+						accessToken,
+						refreshToken,
+						expiresDate: Date.now() + Number(result.expires_in) * 1000
+					});
+				}));
+
+		const { id, username, discriminator } = await new Promise<any>((res, rej) =>
+			request({
+				url: 'https://discordapp.com/api/users/@me',
+				headers: {
+					'Authorization': `Bearer ${accessToken}`,
+					'User-Agent': config.user_agent
+				}
+			}, (err, response, body) => {
+				if (err)
+					rej(err);
+				else
+					res(JSON.parse(body));
+			}));
+
+		if (!id || !username || !discriminator) {
+			ctx.throw(400, 'invalid session');
+			return;
+		}
+
+		let user = await User.findOne({
+			host: null,
+			'discord.id': id
+		}) as ILocalUser;
+
+		if (!user) {
+			ctx.throw(404, `@${username}#${discriminator}と連携しているMisskeyアカウントはありませんでした...`);
+			return;
+		}
+
+		user = await User.findOneAndUpdate({
+			host: null,
+			'discord.id': id
+		}, {
+			$set: {
+				discord: {
+					accessToken,
+					refreshToken,
+					expiresDate,
+					username,
+					discriminator
+				}
+			}
+		}) as ILocalUser;
+
+		signin(ctx, user, true);
+	} else {
+		const code = ctx.query.code;
+
+		if (!code) {
+			ctx.throw(400, 'invalid session');
+			return;
+		}
+
+		const { redirect_uri, state } = await new Promise<any>((res, rej) => {
+			redis.get(userToken, async (_, state) => {
+				res(JSON.parse(state));
+			});
+		});
+
+		if (ctx.query.state !== state) {
+			ctx.throw(400, 'invalid session');
+			return;
+		}
+
+		const { accessToken, refreshToken, expiresDate } = await new Promise<any>((res, rej) =>
+			oauth2.getOAuthAccessToken(
+				code,
+				{
+					grant_type: 'authorization_code',
+					redirect_uri
+				},
+				(err, accessToken, refreshToken, result) => {
+					if (err)
+						rej(err);
+					else if (result.error)
+						rej(result.error);
+					else
+						res({
+							accessToken,
+							refreshToken,
+							expiresDate: Date.now() + Number(result.expires_in) * 1000
+						});
+				}));
+
+		const { id, username, discriminator } = await new Promise<any>((res, rej) =>
+			request({
+				url: 'https://discordapp.com/api/users/@me',
+				headers: {
+					'Authorization': `Bearer ${accessToken}`,
+					'User-Agent': config.user_agent
+				}
+			}, (err, response, body) => {
+				if (err)
+					rej(err);
+				else
+					res(JSON.parse(body));
+			}));
+
+		if (!id || !username || !discriminator) {
+			ctx.throw(400, 'invalid session');
+			return;
+		}
+
+		const user = await User.findOneAndUpdate({
+			host: null,
+			token: userToken
+		}, {
+			$set: {
+				discord: {
+					accessToken,
+					refreshToken,
+					expiresDate,
+					id,
+					username,
+					discriminator
+				}
+			}
+		});
+
+		ctx.body = `Discord: @${username}#${discriminator} を、Misskey: @${user.username} に接続しました！`;
+
+		// Publish i updated event
+		publishMainStream(user._id, 'meUpdated', await pack(user, user, {
+			detail: true,
+			includeSecrets: true
+		}));
+	}
+});
+
+module.exports = router;

src/server/api/service/github-bot.ts

@@ -92,7 +92,7 @@ handler.on('push', event => {
 			const compare = event.compare;
 			const commits: any[] = event.commits;
 			post([
-				`Pushed by **${pusher.name}** with ?[${commits.length} commit${commits.length > 1 ? 's' : ''}](${compare}):`,
+				`🆕 Pushed by **${pusher.name}** with ?[${commits.length} commit${commits.length > 1 ? 's' : ''}](${compare}):`,
 				commits.reverse().map(commit => `・[?[${commit.id.substr(0, 7)}](${commit.url})] ${commit.message.split('\n')[0]}`).join('\n'),
 			].join('\n'));
 			break;
@@ -108,9 +108,9 @@ handler.on('issues', event => {
 	const action = event.action;
 	let title: string;
 	switch (action) {
-		case 'opened': title = 'Issue opened'; break;
+		case 'opened': title = '💥 Issue opened'; break;
-		case 'closed': title = 'Issue closed'; break;
+		case 'closed': title = '💮 Issue closed'; break;
-		case 'reopened': title = 'Issue reopened'; break;
+		case 'reopened': title = '🔥 Issue reopened'; break;
 		default: return;
 	}
 	post(`${title}: <${issue.number}>「${issue.title}」\n${issue.html_url}`);
@@ -122,7 +122,7 @@ handler.on('issue_comment', event => {
 	const action = event.action;
 	let text: string;
 	switch (action) {
-		case 'created': text = `Commented to「${issue.title}」:${comment.user.login}「${comment.body}」\n${comment.html_url}`; break;
+		case 'created': text = `💬 Commented to「${issue.title}」:${comment.user.login}「${comment.body}」\n${comment.html_url}`; break;
 		default: return;
 	}
 	post(text);
@@ -143,12 +143,12 @@ handler.on('pull_request', event => {
 	const action = event.action;
 	let text: string;
 	switch (action) {
-		case 'opened': text = `New Pull Request:「${pr.title}」\n${pr.html_url}`; break;
+		case 'opened': text = `📦 New Pull Request:「${pr.title}」\n${pr.html_url}`; break;
-		case 'reopened': text = `Pull Request Reopened:「${pr.title}」\n${pr.html_url}`; break;
+		case 'reopened': text = `🗿 Pull Request Reopened:「${pr.title}」\n${pr.html_url}`; break;
 		case 'closed':
 			text = pr.merged
-				? `Pull Request Merged!:「${pr.title}」\n${pr.html_url}`
+				? `💯 Pull Request Merged!:「${pr.title}」\n${pr.html_url}`
-				: `Pull Request Closed:「${pr.title}」\n${pr.html_url}`;
+				: `🚫 Pull Request Closed:「${pr.title}」\n${pr.html_url}`;
 			break;
 		default: return;
 	}