Merge pull request #2413 from syuilo/master

Master

.autogen/autogen.sh

@@ -0,0 +1,86 @@
+#!/usr/bin/env bash
+# BEARER_TOKEN=
+# CAMPAIGN_ID=
+# GITHUB_TOKEN=
+# HEAD='acid-chicken:patch-autogen'
+# REPO='syuilo/misskey'
+test "$(curl -LSs -w '\n' -- "https://api.github.com/repos/$REPO/pulls?access_token=$GITHUB_TOKEN" | jq -r '.[].head.label' | grep $HEAD)" && exit 1
+cd "$(dirname $0)/.." && \
+touch null.cache && \
+rm *.cache && \
+git checkout master && \
+git pull origin master && \
+git pull upstream master && \
+git stash && \
+git rebase -f upstream/master && \
+git branch patch-autogen && \
+git checkout patch-autogen && \
+git reset --hard HEAD || \
+exit 1
+touch patreon.md.cache && \
+rm patreon.md.cache && \
+echo '<!-- PATREON_START -->' > patreon.md.cache && \
+URL="https://www.patreon.com/api/oauth2/v2/campaigns/$CAMPAIGN_ID/members?include=currently_entitled_tiers,user&fields%5Btier%5D=title&fields%5Buser%5D=full_name,thumb_url,url,hide_pledges"
+while :
+ do
+  touch patreon.raw.cache && \
+  rm patreon.raw.cache && \
+  curl -LSs -w '\n' -H "Authorization: Bearer $BEARER_TOKEN" -- $URL > patreon.raw.cache && \
+  touch patreon.cache && \
+  rm patreon.cache && \
+  cat patreon.raw.cache | \
+  jq -r '(.data|map(select(.relationships.currently_entitled_tiers.data[]))|map(.relationships.user.data.id))as$data|.included|map(select(.attributes.hide_pledges==false))|map(select(.id as$id|$data|contains([$id])))|map(.attributes|[.full_name,.thumb_url,.url]|@tsv)|.[]|@text' >> patreon.cache && \
+  echo '<table><tr>' >> patreon.md.cache && \
+  cat patreon.cache | \
+  awk -F'\t' '{print $2,$1}' | \
+  sed -e 's/ /\\" alt=\\"/' | \
+  xargs -I% echo '<td><img src="%"></td>' >> patreon.md.cache && \
+  echo '</tr><tr>' >> patreon.md.cache && \
+  cat patreon.cache | \
+  awk -F'\t' '{print $3,$1}' | \
+  sed -e 's/ /\\">/' | \
+  xargs -I% echo '<td><a href="%</a></td>' >> patreon.md.cache && \
+  echo '</tr></table>' >> patreon.md.cache || \
+  exit 1
+  NEW_URL="$(cat patreon.raw.cache | jq -r '.links.next')"
+  test "$NEW_URL" = 'null' && \
+  break || \
+  URL="$NEW_URL"
+done
+IGNORE= && \
+echo -e "\n**Last updated:** $(date -uR | sed 's/\+0000/UTC/')\n<!-- PATREON_END -->" >> patreon.md.cache && \
+touch README.md && \
+touch .autogen/README.md && \
+rm .autogen/README.md && \
+mv README.md .autogen/README.md && \
+cat .autogen/README.md | while IFS= read LINE;
+ do
+  if [[ -z "$IGNORE" ]]
+   then
+    if [[ "$LINE" = '<!-- PATREON_START -->' ]]
+     then
+      IGNORE='PATREON_INSIDE'
+     else
+      echo "$LINE" >> README.md
+    fi
+   else
+    if [[ "$LINE" = '<!-- PATREON_END -->' ]]
+     then
+      IGNORE=
+      cat patreon.md.cache >> README.md
+    fi
+  fi
+done
+cat patreon.md.cache
+touch null.cache && \
+rm *.cache && \
+diff .autogen/README.md README.md > diff.cache
+cat diff.cache && \
+test 4 -lt $(cat diff.cache | wc -l) && \
+git add README.md && \
+git commit -m 'Update README.md [AUTOGEN]' && \
+git push -f origin patch-autogen && \
+curl -LSs -w '\n' -X POST -d '{"title":"[AUTOMATED] Update README.md","body":"*This pull request was created by a tool.*","head":"'$HEAD'","base":"master"}' -- "https://api.github.com/repos/$REPO/pulls?access_token=$GITHUB_TOKEN"
+git stash
+git checkout master
+git branch -D patch-autogen

README.md

@@ -55,23 +55,24 @@ Misskey is using Crowdin for l10n.
 <table><tr>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12378075/0156f769e20f412594fa6b87d85fe228/1?token-time=2145916800&token-hash=IsIJRUXszzoD6-7pDnRY8I05T9nSznc4GTaxj7C9SwU%3D" alt="39ff"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12731202/0995c46cdcb54153ab5f073f5869b70a/1?token-time=2145916800&token-hash=Yd60FK_SWfQO56SeiJpy1tDHOnCV4xdEywQe8gn5_Wo%3D" alt="negao"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/13099460/43cecdbaa63a40d79bf50a96b9910b9d/1?token-time=2145916800&token-hash=d6P5MWHHsCMxUuBAEPAoVc5wLUR19mIhqAq7Ma9h9rI%3D" alt="ne_moni"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12913507/f7181eacafe8469a93033d85f5969c29/1?token-time=2145916800&token-hash=f03BFb4S2FUx9YEt87TnEmifb4h33OywGBW2akQVtQY%3D" alt="Melilot"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/3384329/8b713330cb27404ea6e9fac50ff96efe/1?token-time=2145916800&token-hash=0eu4-m1gTWA9PhptVZt6rdKcusqcD7RB87rJT23VVFI%3D" alt="べすれい"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12021162/963128bb8d14476dbd8407943db8f31a/1?token-time=2145916800&token-hash=GgJ_NmUB6_nnRNLVGUWjV-WX91On7BOu59LKncYV9fE%3D" alt="gutfuckllc"></td>
 <td><img src="https://c8.patreon.com/2/100/12718187" alt="Peter G."></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/13039004/509d0c412eb14ae08d6a812a3054f7d6/1?token-time=2145916800&token-hash=zwSu01tOtn5xTUucDZHuPsCxF2HBEMVs9ROJKTlEV_o%3D" alt="nemu"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/2?token-time=2145916800&token-hash=zElv7ZcPL3viGsXbNG_KWiKrbV0vvw1gk0panx8DJoo%3D" alt="Naoki Kosaka"></td>
 </tr><tr>
 <td><a href="https://www.patreon.com/user?u=12378075">39ff</a></td>
 <td><a href="https://www.patreon.com/user?u=12731202">negao</a></td>
+<td><a href="https://www.patreon.com/user?u=13099460">ne_moni</a></td>
 <td><a href="https://www.patreon.com/user?u=12913507">Melilot</a></td>
 <td><a href="https://www.patreon.com/user?u=3384329">べすれい</a></td>
 <td><a href="https://www.patreon.com/gutfuckllc">gutfuckllc</a></td>
 <td><a href="https://www.patreon.com/user?u=12718187">Peter G.</a></td>
 <td><a href="https://www.patreon.com/user?u=13039004">nemu</a></td>
-<td><a href="https://www.patreon.com/user?u=5881381">Naoki Kosaka</a></td>
 </tr></table>
 <table><tr>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/2?token-time=2145916800&token-hash=zElv7ZcPL3viGsXbNG_KWiKrbV0vvw1gk0panx8DJoo%3D" alt="Naoki Kosaka"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12931605/ead494101f364dffa90efe49e36fb494/1?token-time=2145916800&token-hash=NzSFPjIlodXyv41rwK61aZWVZWfI4surJaNj8vWKvqM%3D" alt="Reiju"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/13034746/c711c7f58e204ecfbc2fd646bc8a4eee/1?token-time=2145916800&token-hash=UERBN4OyP7Nh5XwwdDg0N0IE5cD6_qUQMO81Z5Wizso%3D" alt="Hiratake"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/4503830/ccf2cc867ea64de0b524bb2e24b9a1cb/1?token-time=2145916800&token-hash=S1zP0QyLU52Dqq6dtc9qNYyWfW86XrYHiR4NMbeOrnA%3D" alt="dansup"></td>
@@ -79,6 +80,7 @@ Misskey is using Crowdin for l10n.
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1?token-time=2145916800&token-hash=tMosUojzUYJCH_3t--tvYA-SMCyrS__hzSndyaRSnbo%3D" alt="Takashi Shibuya"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12959468/c249e15aebec4424b5c0f427173671b6/1?token-time=2145916800&token-hash=lubpCEdxAkxPlpR2O6bvZ7BIh8Q4nGf-U_mE1qpjVAQ%3D" alt="fujishan"></td>
 </tr><tr>
+<td><a href="https://www.patreon.com/user?u=5881381">Naoki Kosaka</a></td>
 <td><a href="https://www.patreon.com/user?u=12931605">Reiju</a></td>
 <td><a href="https://www.patreon.com/hiratake">Hiratake</a></td>
 <td><a href="https://www.patreon.com/dansup">dansup</a></td>
@@ -87,7 +89,7 @@ Misskey is using Crowdin for l10n.
 <td><a href="https://www.patreon.com/fujishan">fujishan</a></td>
 </tr></table>
 
-**Last updated:** Mon, 20 Aug 2018 10:02:31 UTC
+**Last updated:** Wed, 22 Aug 2018 05:25:06 UTC
 <!-- PATREON_END -->
 
 :four_leaf_clover: Copyright

crowdin.yml

@@ -1,3 +1,3 @@
 files:
-  - source: /locales/ja.yml
+  - source: /locales/ja-JP.yml
-    translation: /locales/%two_letters_code%.yml
+    translation: /locales/%locale%.yml

locales/ca-ES.yml

@@ -58,7 +58,7 @@ common:
     friday: "金曜日"
     saturday: "土曜日"
   reactions:
-    like: "いいね"
+    like: "ええやん"
     love: "しゅき"
     laugh: "笑"
     hmm: "ふぅ～む"

locales/de-DE.yml

@@ -58,7 +58,7 @@ common:
     friday: "金曜日"
     saturday: "土曜日"
   reactions:
-    like: "Gefällt mir"
+    like: "ええやん"
     love: "Lieben"
     laugh: "Lachen"
     hmm: "Hmm...?"

locales/es-ES.yml

@@ -58,7 +58,7 @@ common:
     friday: "Viernes"
     saturday: "Sábado"
   reactions:
-    like: "me gusta"
+    like: "ええやん"
     love: "amor"
     laugh: "risa"
     hmm: "hmm"

locales/fr-FR.yml

@@ -30,7 +30,7 @@ common:
     quoted-by: "Cité·e par {} :"
   time:
     unknown: "inconnu"
-    future: "future"
+    future: "à l'instant"
     just_now: "à l'instant"
     seconds_ago: "Il y a {} seconde·s"
     minutes_ago: "Il y a {} minute·s"
@@ -58,7 +58,7 @@ common:
     friday: "Vendredi"
     saturday: "Samedi"
   reactions:
-    like: "Aime"
+    like: "ええやん"
     love: "Adore"
     laugh: "Rire"
     hmm: "Hmm ... ?"
@@ -287,7 +287,7 @@ common/views/components/signin.vue:
   signin: "Se connecter"
   or: "Ou"
   signin-with-twitter: "Se connecter via Twitter"
-  login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
+  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"
   invitation-info: "Si vous n’avez pas de code d’invitation, contactez un·e <a href=\"{}\">administrateur·rice</a>."
@@ -443,7 +443,7 @@ desktop/views/components/drive-window.vue:
 desktop/views/components/drive.file.vue:
   avatar: "Avatar"
   banner: "Bannière"
-  nsfw: "閲覧注意"
+  nsfw: "CW"
   contextmenu:
     rename: "Renommer"
     mark-as-sensitive: "Marquer comme sensible"
@@ -638,7 +638,7 @@ desktop/views/components/settings.vue:
   show-maps-desc: "位置情報が添付された投稿のマップを自動的に展開します。"
   sound: "Son"
   enable-sounds: "Activer le son"
-  enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
+  enable-sounds-desc: "Jouer un son lorsque vous recevez un message. Ce paramètre est sauvegardé dans le navigateur."
   volume: "Volume"
   test: "Test"
   mobile: "Mobile"
@@ -699,7 +699,7 @@ desktop/views/components/settings.2fa.vue:
 desktop/views/components/settings.api.vue:
   intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
   caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
-  regeneration-of-token: "万が一このトークンが漏れたりその可能性がある場合はトークンを再生成できます。"
+  regeneration-of-token: "Si votre jeton est compromis, vous pouvez le régénérer."
   regenerate-token: "Regenerer le token"
   token: "Jeton :"
   enter-password: "Veuillez entrer le mot de passe"

locales/index.js

@@ -11,13 +11,13 @@ const loadLang = lang => yaml.safeLoad(
 const native = loadLang('ja-JP');
 
 const langs = {
-	'de': loadLang('de'),
+	'de-DE': loadLang('de-DE'),
-	'en': loadLang('en'),
+	'en-US': loadLang('en-US'),
-	'fr': loadLang('fr'),
+	'fr-FR': loadLang('fr-FR'),
-	'ja': native,
+	'ja-JP': native,
 	'ja-KS': loadLang('ja-KS'),
-	'pl': loadLang('pl'),
+	'pl-PL': loadLang('pl-PL'),
-	'es': loadLang('es')
+	'es-ES': loadLang('es-ES')
 };
 
 Object.values(langs).forEach(locale => {

locales/it-IT.yml

@@ -58,7 +58,7 @@ common:
     friday: "金曜日"
     saturday: "土曜日"
   reactions:
-    like: "いいね"
+    like: "ええやん"
     love: "しゅき"
     laugh: "笑"
     hmm: "ふぅ～む"

locales/ja-JP.yml

@@ -90,6 +90,7 @@ common:
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  use-contrast-reversi-stones: "リバーシのアイコンにコントラストを付ける"
   verified-user: "公式アカウント"
   disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
 
@@ -856,6 +857,7 @@ desktop/views/components/ui.header.account.vue:
   lists: "リスト"
   follow-requests: "フォロー申請"
   customize: "ホームのカスタマイズ"
+  admin: "管理"
   settings: "設定"
   signout: "サインアウト"
   dark: "闇に飲まれる"
@@ -1213,6 +1215,7 @@ mobile/views/components/ui.nav.vue:
   game: "ゲーム"
   darkmode: "ダークモード"
   settings: "設定"
+  admin: "管理"
   about: "Misskeyについて"
 
 mobile/views/components/user-timeline.vue:

locales/ko-KR.yml

@@ -58,7 +58,7 @@ common:
     friday: "금요일"
     saturday: "토요일"
   reactions:
-    like: "좋네"
+    like: "ええやん"
     love: "좋아"
     laugh: "크크"
     hmm: "음..."

locales/pl-PL.yml

@@ -58,7 +58,7 @@ common:
     friday: "Piątek"
     saturday: "Sobota"
   reactions:
-    like: "Lubię"
+    like: "ええやん"
     love: "Kocham"
     laugh: "Śmieszne"
     hmm: "Hmm…?"

locales/pt-PT.yml

@@ -3,147 +3,147 @@ meta:
   lang: "Português"
   divider: ""
 common:
-  misskey: "A ⭐ of fediverse"
+  misskey: "Uma ⭐ do fediverso"
-  about-title: "A ⭐ of fediverse."
+  about-title: "Uma ⭐ do fediverso."
-  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
+  about: "Obrigado por encontrar Misskey. Uma <b>plataforma descentralizada de microblog</b> nascida na Terra. Já que ela existe no Fediverso (um universo onde várias plataformas de mídia social são organizadas), ela é ligada com outras plataformas.Por que você não tira uma folga do agito e confusão da cidade, e mergulha em uma nova internet?"
   adblock:
-    detected: "広告ブロッカーを無効にしてください"
+    detected: "Por favor, desative o bloqueador de anúncios."
-    warning: "<strong>Misskeyは広告を掲載していません</strong>が、広告をブロックする機能が有効だと一部の機能が利用できなかったり、不具合が発生する場合があります。"
+    warning: "Alguns recursos podem não estar disponíveis ou apresentar mal funcionamento se o bloqueio de anúncios estiver ativado. <strong>Misskey não está usando anúncios</strong>"
-  application-authorization: "アプリの連携"
+  application-authorization: "Aplicativos autorizados"
-  close: "閉じる"
+  close: "Fechar"
-  do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
+  do-not-copy-paste: "Por favor, não digite ou copie o código aqui. A conta pode ser comprometida."
-  got-it: "わかった"
+  got-it: "Entendi!"
   customization-tips:
-    title: "カスタマイズのヒント"
+    title: "Dicas de personalização"
-    paragraph1: "ホームのカスタマイズでは、ウィジェットを追加/削除したり、ドラッグ&ドロップして並べ替えたりすることができます。"
+    paragraph1: "Personalização da página inicial permite adicionar/remover, arrastar e soltar e reorganizar widgets."
-    paragraph2: "一部のウィジェットは、<strong><strong>右</strong>クリック</strong>することで表示を変更することができます。"
+    paragraph2: "Você pode mudar a visualização de alguns widgets <strong>clicando com o botão <strong>direito.</strong></strong>"
-    paragraph3: "ウィジェットを削除するには、ヘッダーの<strong>「ゴミ箱」</strong>と書かれたエリアにウィジェットをドラッグ&ドロップします。"
+    paragraph3: "Para apagar um widget, o arraste e solte <strong>na área chamada \"Lixo\"</strong> no cabeçalho."
-    paragraph4: "カスタマイズを終了するには、右上の「完了」をクリックします。"
+    paragraph4: "Para terminar a personalização clique em \"Terminar\" acima e à direita."
-    gotit: "Got it!"
+    gotit: "Entendi!"
   notification:
-    file-uploaded: "ファイルがアップロードされました"
+    file-uploaded: "Arquivo enviado!"
-    message-from: "{}さんからメッセージ:"
+    message-from: "Mensagem de {}:"
-    reversi-invited: "対局への招待があります"
+    reversi-invited: "Convidado a jogar"
-    reversi-invited-by: "{}さんから"
+    reversi-invited-by: "Convidado por {}:"
-    notified-by: "{}さんから"
+    notified-by: "Notificado por {}:"
-    reply-from: "{}さんから返信:"
+    reply-from: "Resposta de {}:"
-    quoted-by: "{}さんが引用:"
+    quoted-by: "Citado por {}:"
   time:
-    unknown: "なぞのじかん"
+    unknown: "Desconhecido"
-    future: "未来"
+    future: "futuro"
-    just_now: "たった今"
+    just_now: "agora"
-    seconds_ago: "{}秒前"
+    seconds_ago: "{} sec atrás"
-    minutes_ago: "{}分前"
+    minutes_ago: "{} min atrás"
-    hours_ago: "{}時間前"
+    hours_ago: "{} h atrás"
-    days_ago: "{}日前"
+    days_ago: "{} d atrás"
-    weeks_ago: "{}週間前"
+    weeks_ago: "{} sem atrás"
-    months_ago: "{}ヶ月前"
+    months_ago: "{} m atrás"
-    years_ago: "{}年前"
+    years_ago: "{} ano(s) atrás"
-  month-and-day: "{month}月 {day}日"
+  month-and-day: "{day}/{month}"
-  trash: "ゴミ箱"
+  trash: "Lixo"
   weekday-short:
-    sunday: "日"
+    sunday: "Dom"
-    monday: "月"
+    monday: "Seg"
-    tuesday: "火"
+    tuesday: "Ter"
-    wednesday: "水"
+    wednesday: "Qua"
-    thursday: "木"
+    thursday: "Qui"
-    friday: "金"
+    friday: "Sex"
-    saturday: "土"
+    saturday: "Seb"
   weekday:
-    sunday: "日曜日"
+    sunday: "domingo"
-    monday: "月曜日"
+    monday: "segunda"
-    tuesday: "火曜日"
+    tuesday: "terça"
-    wednesday: "水曜日"
+    wednesday: "quarta"
-    thursday: "木曜日"
+    thursday: "quinta"
-    friday: "金曜日"
+    friday: "sexta"
-    saturday: "土曜日"
+    saturday: "sábado"
   reactions:
-    like: "いいね"
+    like: "Legal..."
-    love: "しゅき"
+    love: "Amei"
-    laugh: "笑"
+    laugh: "Riso"
-    hmm: "ふぅ～む"
+    hmm: "Hmm...?"
-    surprise: "わお"
+    surprise: "Uau"
-    congrats: "おめでとう"
+    congrats: "Parabéns!"
-    angry: "おこ"
+    angry: "Raiva"
-    confused: "こまこまのこまり"
+    confused: "Confuso"
     rip: "RIP"
-    pudding: "Pudding"
+    pudding: "Pudim"
   note-placeholders:
-    a: "今どうしてる？"
+    a: "O que está fazendo?"
-    b: "何かありましたか？"
+    b: "O que está acontecendo?"
-    c: "何をお考えですか？"
+    c: "No que está pensando?"
-    d: "言いたいことは？"
+    d: "Quer postar algo?"
-    e: "ここに書いてください"
+    e: "Escreva aqui"
-    f: "あなたが書くのを待っています..."
+    f: "Esperando você escrever."
-  search: "検索"
+  search: "Buscar"
-  delete: "削除"
+  delete: "Apagar"
-  loading: "読み込み中"
+  loading: "Carregando"
-  ok: "わかった"
+  ok: "OK"
-  update-available-title: "更新があります"
+  update-available-title: "Atualização disponível"
-  update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
+  update-available: "Uma nova versão de Misskey está disponível ({newer}). A versão atual é {current}. Recarregue a página para atualizar."
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
-  i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
+  i-like-sushi: "Eu prefiro sushi a pudim"
-  show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  show-reversi-board-labels: "Mostrar etiquetas de colunas e linhas no Reversi"
-  verified-user: "公式アカウント"
+  verified-user: "Conta verificada"
-  disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
+  disable-animated-mfm: "Desativar texto animado nas publicações"
   reversi:
-    drawn: "引き分け"
+    drawn: "Empatado"
-    my-turn: "あなたのターンです"
+    my-turn: "Seu turno"
-    opponent-turn: "相手のターンです"
+    opponent-turn: "Turno do oponente"
-    turn-of: "{}のターンです"
+    turn-of: "turno de {}"
-    past-turn-of: "{}のターン"
+    past-turn-of: "turno de {}"
-    won: "{}の勝ち"
+    won: "{} venceu"
-    black: "黒"
+    black: "Pretas"
-    white: "白"
+    white: "Brancas"
-    total: "合計"
+    total: "Total"
     this-turn: "{}ターン目"
   widgets:
-    analog-clock: "アナログ時計"
+    analog-clock: "Relógio analógico"
-    profile: "プロフィール"
+    profile: "Perfil"
-    calendar: "カレンダー"
+    calendar: "Calendário"
-    timemachine: "カレンダー(タイムマシン)"
+    timemachine: "Calendário (máquina do tempo)"
-    activity: "アクティビティ"
+    activity: "Atividade"
-    rss: "RSSリーダー"
+    rss: "Leitor de RSS"
-    memo: "付箋"
+    memo: "Nota adesiva"
     trends: "トレンド"
     photo-stream: "フォトストリーム"
     posts-monitor: "投稿チャート"
     slideshow: "スライドショー"
-    version: "バージョン"
+    version: "Versão"
     broadcast: "ブロードキャスト"
-    notifications: "通知"
+    notifications: "Notificações"
-    users: "おすすめユーザー"
+    users: "Usuário sugeridos"
-    polls: "アンケート"
+    polls: "Enquetes"
     post-form: "投稿フォーム"
-    messaging: "メッセージ"
+    messaging: "Mensagens"
-    server: "サーバー情報"
+    server: "Informações do servidor"
-    donation: "寄付のお願い"
+    donation: "Doações"
-    nav: "ナビゲーション"
+    nav: "Navegação"
-    tips: "ヒント"
+    tips: "Dicas"
-    hashtags: "ハッシュタグ"
+    hashtags: "Hashtags"
   deck:
-    widgets: "ウィジェット"
+    widgets: "Widgets"
-    home: "ホーム"
+    home: "Início"
-    local: "ローカル"
+    local: "Local"
-    hybrid: "ソーシャル"
+    hybrid: "Social"
-    global: "グローバル"
+    global: "Global"
-    notifications: "通知"
+    notifications: "Notificações"
-    list: "リスト"
+    list: "Listas"
-    swap-left: "左に移動"
+    swap-left: "Mover para a esquerda"
-    swap-right: "右に移動"
+    swap-right: "Mover para a direita"
-    swap-up: "上に移動"
+    swap-up: "Mover para cima"
-    swap-down: "下に移動"
+    swap-down: "Mover para baixo"
-    remove: "カラムを削除"
+    remove: "Remover"
     add-column: "カラムを追加"
-    rename: "名前を変更"
+    rename: "Renomear"
     stack-left: "左に重ねる"
     pop-right: "右に出す"
 auth/views/form.vue:
-  share-access: "<i>{{ app.name }}</i>があなたのアカウントにアクセスすることを<b>許可</b>しますか？"
+  share-access: "Você <b>permite</b> que <i>{{ app.name }}</i> acesse sua conta?"
-  permission-ask: "このアプリは次の権限を要求しています:"
+  permission-ask: "Este aplicativo precisa das seguintes permissões:"
-  account-read: "アカウントの情報を見る。"
+  account-read: "Ver informações da conta."
-  account-write: "アカウントの情報を操作する。"
+  account-write: "Modificar informações da conta."
-  note-write: "投稿する。"
+  note-write: "Publicar"
   like-write: "いいねしたりいいね解除する。"
   following-write: "フォローしたりフォロー解除する。"
   drive-read: "ドライブを見る。"
@@ -193,7 +193,7 @@ common/views/components/games/reversi/reversi.room.vue:
   random: "ランダム"
   black-or-white: "先手/後手"
   black-is: "{}が黒"
-  rules: "ルール"
+  rules: "Regras"
   is-llotheo: "石の少ない方が勝ち(ロセオ)"
   looped-map: "ループマップ"
   can-put-everywhere: "どこでも置けるモード"
@@ -202,7 +202,7 @@ common/views/components/games/reversi/reversi.room.vue:
   waiting-for-other: "相手の準備が完了するのを待っています"
   waiting-for-me: "あなたの準備が完了するのを待っています"
   waiting-for-both: "準備中"
-  cancel: "キャンセル"
+  cancel: "Cancelar"
   ready: "準備完了"
   cancel-ready: "準備続行"
 common/views/components/connect-failed.vue:
@@ -779,7 +779,7 @@ desktop/views/components/user-lists-window.vue:
 desktop/views/components/user-preview.vue:
   notes: "投稿"
   following: "フォロー"
-  followers: "フォロワー"
+  followers: "Seguidores"
 desktop/views/components/users-list.vue:
   all: "すべて"
   iknow: "知り合い"
@@ -793,13 +793,13 @@ desktop/views/components/window.vue:
 desktop/views/pages/admin/admin.vue:
   dashboard: "ダッシュボード"
   drive: "ドライブ"
-  users: "ユーザー"
+  users: "Usuários"
-  update: "更新"
+  update: "Actualizações"
 desktop/views/pages/admin/admin.dashboard.vue:
   dashboard: "ダッシュボード"
-  all-users: "全てのユーザー"
+  all-users: "Todos os usuários"
   original-users: "このインスタンスのユーザー"
-  all-notes: "全てのノート"
+  all-notes: "Todas as notas"
   original-notes: "このインスタンスのノート"
   invite: "招待"
 desktop/views/pages/admin/admin.suspend-user.vue:
@@ -845,24 +845,24 @@ desktop/views/pages/welcome.vue:
   signup: "新規登録"
   signin-button: "やってる"
   signup-button: "やる"
-  timeline: "タイムライン"
+  timeline: "Timeline"
-  powered-by-misskey: "Powered by <b>Misskey</b>."
+  powered-by-misskey: "Desenvolvido por <b>Misskey</b>."
 desktop/views/pages/drive.vue:
-  title: "Misskey Drive"
+  title: "Drive Misskey"
 desktop/views/pages/favorites.vue:
-  more: "さらに読み込む"
+  more: "Carregar mais"
 desktop/views/pages/home-customize.vue:
-  title: "ホームのカスタマイズ"
+  title: "Personalizar a página inicial"
 desktop/views/pages/note.vue:
-  prev: "前の投稿"
+  prev: "Nota anterior"
-  next: "次の投稿"
+  next: "Próxima nota"
 desktop/views/pages/selectdrive.vue:
-  title: "ファイルを選択してください"
+  title: "Selecione um arquivo"
-  ok: "決定"
+  ok: "OK"
-  cancel: "キャンセル"
+  cancel: "Cancelar"
-  upload: "PCからドライブにファイルをアップロード"
+  upload: "Envie arquivos do seu dispositivo"
 desktop/views/pages/search.vue:
-  not-available: "検索機能はインスタンスの設定で無効になっています。"
+  not-available: "A pesquisa está desligada nas configurações desta instância."
   not-found: "「{}」に関する投稿は見つかりませんでした。"
 desktop/views/pages/share.vue:
   share-with: "{}で共有"
@@ -1170,29 +1170,29 @@ mobile/views/pages/user.vue:
   timeline: "タイムライン"
   media: "メディア"
   is-suspended: "このユーザーは凍結されています。"
-  is-remote: "このユーザーはリモートユーザーです。"
+  is-remote: "Este é uma usuário remoto. O perfil que vê aqui pode não estar completo."
-  view-remote: "正確な情報を見る"
+  view-remote: "Ver o perfil completo."
 mobile/views/pages/user/home.vue:
-  recent-notes: "最近の投稿"
+  recent-notes: "Notas recentes"
-  images: "画像"
+  images: "Imagens"
-  activity: "アクティビティ"
+  activity: "Atividade"
   keywords: "キーワード"
   domains: "頻出ドメイン"
   frequently-replied-users: "よく会話するユーザー"
-  followers-you-know: "知り合いのフォロワー"
+  followers-you-know: "Seguidores que você conhece"
-  last-used-at: "最終ログイン"
+  last-used-at: "Ativo pela última vez:"
 mobile/views/pages/user/home.followers-you-know.vue:
-  loading: "読み込み中"
+  loading: "Carregando"
   no-users: "知り合いのユーザーはいません"
 mobile/views/pages/user/home.friends.vue:
   loading: "読み込み中"
   no-users: "よく会話するユーザーはいません"
 mobile/views/pages/user/home.notes.vue:
-  loading: "読み込み中"
+  loading: "Carregando"
-  no-notes: "投稿はありません"
+  no-notes: "Nenhuma mensagem"
 mobile/views/pages/user/home.photos.vue:
-  loading: "読み込み中"
+  loading: "Carregando"
-  no-photos: "写真はありません"
+  no-photos: "Sem fotos"
 docs:
   edit-this-page-on-github: "間違いや改善点を見つけましたか？"
   edit-this-page-on-github-link: "このページをGitHubで編集"
@@ -1209,11 +1209,11 @@ docs:
       duration-limit: "直近{duration}ミリ秒の間のこのエンドポイントへのリクエスト数の合計が{max}を超える場合はリクエストできません。"
       min-interval-limit: "前回のリクエストから{interval}ミリ秒経っていない場合はリクエストできません。"
       show-src: "このエンドポイントのソースコードも閲覧できます。"
-      show-src-link: "コードをGitHubで見る"
+      show-src-link: "Veja o código no GitHub"
-      generated: "このドキュメントはAPI定義に基づき自動生成されています。"
+      generated: "Este documento foi gerado pelas definições da API."
     props:
-      name: "名前"
+      name: "Nome"
-      type: "型"
+      type: "Tipo"
-      description: "説明"
+      description: "Descrição"
 dev/views/index.vue:
-  manage-apps: "アプリの管理"
+  manage-apps: "Gerenciar aplicativos"

locales/ru-RU.yml

@@ -58,7 +58,7 @@ common:
     friday: "金曜日"
     saturday: "土曜日"
   reactions:
-    like: "いいね"
+    like: "ええやん"
     love: "しゅき"
     laugh: "笑"
     hmm: "ふぅ～む"

locales/zh-CN.yml

@@ -58,7 +58,7 @@ common:
     friday: "金曜日"
     saturday: "土曜日"
   reactions:
-    like: "いいね"
+    like: "ええやん"
     love: "しゅき"
     laugh: "笑"
     hmm: "ふぅ～む"

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "7.2.0",
+	"version": "7.4.0",
-	"clientVersion": "1.0.8724",
+	"clientVersion": "1.0.8790",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
@@ -157,6 +157,7 @@
 		"monk": "6.0.6",
 		"ms": "2.1.1",
 		"nan": "2.10.0",
+		"nested-property": "0.0.7",
 		"node-sass": "4.9.3",
 		"node-sass-json-importer": "3.3.1",
 		"nprogress": "0.2.0",
@@ -190,7 +191,7 @@
 		"style-loader": "0.22.1",
 		"stylus": "0.54.5",
 		"stylus-loader": "3.0.2",
-		"summaly": "2.1.3",
+		"summaly": "2.1.4",
 		"systeminformation": "3.42.9",
 		"syuilo-password-strength": "0.0.1",
 		"textarea-caret": "3.1.0",

src/client/app/boot.js

@@ -38,12 +38,18 @@
 	//#endregion
 
 	//#region Detect the user language
-	let lang = navigator.language;
+	let lang = null;
 
-	if (!LANGS.includes(lang)) lang = lang.split('-')[0];
+	if (LANGS.includes(navigator.language)) {
+		lang = navigator.language;
+	} else {
+		lang = LANGS.find(x => x.split('-')[0] == navigator.language);
 
-	// The default language is English
+		if (lang == null) {
-	if (!LANGS.includes(lang)) lang = 'en';
+			// Fallback
+			lang = 'en-US';
+		}
+	}
 
 	if (settings) {
 		if (settings.device.lang) lang = settings.device.lang;

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

@@ -18,11 +18,11 @@
 	</div>
 
 	<div class="board">
-		<div class="labels-x" v-if="this.$store.state.settings.reversiBoardLabels">
+		<div class="labels-x" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
 			<span v-for="i in game.settings.map[0].length">{{ String.fromCharCode(64 + i) }}</span>
 		</div>
 		<div class="flex">
-			<div class="labels-y" v-if="this.$store.state.settings.reversiBoardLabels">
+			<div class="labels-y" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
 				<div v-for="i in game.settings.map.length">{{ i }}</div>
 			</div>
 			<div class="cells" :style="cellsStyle">
@@ -30,15 +30,15 @@
 						:class="{ empty: stone == null, none: o.map[i] == 'null', isEnded: game.isEnded, myTurn: !game.isEnded && isMyTurn, can: turnUser ? o.canPut(turnUser.id == blackUser.id, i) : null, prev: o.prevPos == i }"
 						@click="set(i)"
 						:title="`${String.fromCharCode(65 + o.transformPosToXy(i)[0])}${o.transformPosToXy(i)[1] + 1}`">
-					<img v-if="stone === true" :src="blackUser.avatarUrl" alt="">
+					<img v-if="stone === true" :src="blackUser.avatarUrl" alt="black" :class="{ contrast: $store.state.settings.games.reversi.useContrastStones }">
-					<img v-if="stone === false" :src="whiteUser.avatarUrl" alt="">
+					<img v-if="stone === false" :src="whiteUser.avatarUrl" alt="white" :class="{ contrast: $store.state.settings.games.reversi.useContrastStones }">
 				</div>
 			</div>
-			<div class="labels-y" v-if="this.$store.state.settings.reversiBoardLabels">
+			<div class="labels-y" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
 				<div v-for="i in game.settings.map.length">{{ i }}</div>
 			</div>
 		</div>
-		<div class="labels-x" v-if="this.$store.state.settings.reversiBoardLabels">
+		<div class="labels-x" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
 			<span v-for="i in game.settings.map[0].length">{{ String.fromCharCode(64 + i) }}</span>
 		</div>
 	</div>
@@ -421,6 +421,13 @@ root(isDark)
 						width 100%
 						height 100%
 
+						&.contrast
+							&[alt="black"]
+								filter brightness(.5)
+
+							&[alt="white"]
+								filter brightness(2)
+
 	> .graph
 		display grid
 		grid-template-columns repeat(61, 1fr)

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

@@ -6,7 +6,7 @@
 	<i>・</i>
 	<a :href="feedbackUrl" target="_blank">%i18n:@feedback%</a>
 	<i>・</i>
-	<a :href="devUrl">%i18n:@develop%</a>
+	<a href="/dev">%i18n:@develop%</a>
 	<i>・</i>
 	<a href="https://twitter.com/misskey_xyz" target="_blank">Follow us on %fa:B twitter%</a>
 </span>
@@ -14,18 +14,21 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import { docsUrl, statsUrl, statusUrl, devUrl, repositoryUrl, feedbackUrl, lang } from '../../../config';
+import { lang } from '../../../config';
 
 export default Vue.extend({
 	data() {
 		return {
-			aboutUrl: `${docsUrl}/${lang}/about`,
+			aboutUrl: `/docs/${lang}/about`,
-			statsUrl,
+			repositoryUrl: 'https://github.com/syuilo/misskey',
-			statusUrl,
+			feedbackUrl: 'https://github.com/syuilo/misskey/issues/new'
-			devUrl,
-			repositoryUrl: repositoryUrl || `https://github.com/syuilo/misskey`,
-			feedbackUrl: feedbackUrl || `https://github.com/syuilo/misskey/issues/new`
 		}
+	},
+	created() {
+		(this as any).os.getMeta().then(meta => {
+			if (meta.repositoryUrl) this.repositoryUrl = meta.repositoryUrl;
+			if (meta.feedbackUrl) this.feedbackUrl = meta.feedbackUrl;
+		});
 	}
 });
 </script>

src/client/app/common/views/components/url-preview.vue

@@ -1,5 +1,7 @@
 <template>
-<iframe v-if="player" :src="player" heigth="250" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen />
+<div v-if="player.url" class="player" :style="`padding: ${(player.height || 0) / (player.width || 1) * 100}% 0 0`">
+	<iframe :src="player.url" :width="player.width || '100%'" :heigth="player.height || 250" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen />
+</div>
 <div v-else-if="tweetUrl && detail" class="twitter">
 	<blockquote ref="tweet" class="twitter-tweet" :data-theme="$store.state.device.darkmode ? 'dark' : null">
 		<a :href="url"></a>
@@ -46,7 +48,11 @@ export default Vue.extend({
 			thumbnail: null,
 			icon: null,
 			sitename: null,
-			player: null,
+			player: {
+				url: null,
+				width: null,
+				height: null
+			},
 			tweetUrl: null,
 			misskeyUrl
 		};
@@ -170,9 +176,17 @@ export default Vue.extend({
 </script>
 
 <style lang="stylus" scoped>
-iframe
+.twitter
+	position relative
 	width 100%
 
+	> iframe
+		height 100%
+		left 0
+		position absolute
+		top 0
+		width 100%
+
 root(isDark)
 	> a
 		display block

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

@@ -56,8 +56,9 @@
 			<mk-switch v-model="$store.state.settings.showMaps" @change="onChangeShowMaps" text="%i18n:@show-maps%">
 				<span>%i18n:@show-maps-desc%</span>
 			</mk-switch>
-			<mk-switch v-model="$store.state.settings.reversiBoardLabels" @change="onChangeReversiBoardLabels" text="%i18n:common.show-reversi-board-labels%"/>
 			<mk-switch v-model="$store.state.settings.disableAnimatedMfm" @change="onChangeDisableAnimatedMfm" text="%i18n:common.disable-animated-mfm%"/>
+			<mk-switch v-model="$store.state.settings.games.reversi.showBoardLabels" @change="onChangeReversiBoardLabels" text="%i18n:common.show-reversi-board-labels%"/>
+			<mk-switch v-model="$store.state.settings.games.reversi.useContrastStones" @change="onChangeUseContrastReversiStones" text="%i18n:common.use-contrast-reversi-stones%"/>
 		</section>
 
 		<section class="web" v-show="page == 'web'">
@@ -376,7 +377,13 @@ export default Vue.extend({
 		},
 		onChangeReversiBoardLabels(v) {
 			this.$store.dispatch('settings/set', {
-				key: 'reversiBoardLabels',
+				key: 'games.reversi.showBoardLabels',
+				value: v
+			});
+		},
+		onChangeUseContrastReversiStones(v) {
+			this.$store.dispatch('settings/set', {
+				key: 'games.reversi.useContrastStones',
 				value: v
 			});
 		},

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

@@ -30,10 +30,8 @@
 				<li @click="settings">
 					<p>%fa:cog%<span>%i18n:@settings%</span>%fa:angle-right%</p>
 				</li>
-			</ul>
+				<li v-if="$store.state.i.isAdmin">
-			<ul>
+					<router-link to="/admin">%fa:terminal%<span>%i18n:@admin%</span>%fa:angle-right%</router-link>
-				<li @click="signout">
-					<p class="signout">%fa:power-off%<span>%i18n:@signout%</span></p>
 				</li>
 			</ul>
 			<ul>
@@ -41,6 +39,11 @@
 					<p><span>%i18n:@dark%</span><template v-if="$store.state.device.darkmode">%fa:moon%</template><template v-else>%fa:R moon%</template></p>
 				</li>
 			</ul>
+			<ul>
+				<li @click="signout">
+					<p class="signout">%fa:power-off%<span>%i18n:@signout%</span></p>
+				</li>
+			</ul>
 		</div>
 	</transition>
 </div>

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

@@ -11,6 +11,10 @@
 		<x-cpu-memory :connection="connection"/>
 	</div>
 	<div>
+		<label>
+			<input type="checkbox" v-model="disableRegistration" @change="updateMeta">
+			<span>disableRegistration</span>
+		</label>
 		<button class="ui" @click="invite">%i18n:@invite%</button>
 		<p v-if="inviteCode">Code: <code>{{ inviteCode }}</code></p>
 	</div>
@@ -28,6 +32,7 @@ export default Vue.extend({
 	data() {
 		return {
 			stats: null,
+			disableRegistration: false,
 			inviteCode: null,
 			connection: null,
 			connectionId: null
@@ -37,6 +42,10 @@ export default Vue.extend({
 		this.connection = (this as any).os.streams.serverStatsStream.getConnection();
 		this.connectionId = (this as any).os.streams.serverStatsStream.use();
 
+		(this as any).os.getMeta().then(meta => {
+			this.disableRegistration = meta.disableRegistration;
+		});
+
 		(this as any).api('stats').then(stats => {
 			this.stats = stats;
 		});
@@ -49,6 +58,11 @@ export default Vue.extend({
 			(this as any).api('admin/invite').then(x => {
 				this.inviteCode = x.code;
 			});
+		},
+		updateMeta() {
+			(this as any).api('admin/update-meta', {
+				disableRegistration: this.disableRegistration
+			});
 		}
 	}
 });

src/client/app/mobile/views/components/follow-button.vue

@@ -99,7 +99,7 @@ export default Vue.extend({
 	cursor pointer
 	padding 0 16px
 	margin 0
-	min-width 150px
+	min-width 100px
 	line-height 36px
 	font-size 14px
 	font-weight bold

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

@@ -12,6 +12,7 @@ import noteCard from './note-card.vue';
 import userCard from './user-card.vue';
 import noteDetail from './note-detail.vue';
 import followButton from './follow-button.vue';
+import muteButton from './mute-button.vue';
 import friendsMaker from './friends-maker.vue';
 import notification from './notification.vue';
 import notifications from './notifications.vue';
@@ -36,6 +37,7 @@ Vue.component('mk-note-card', noteCard);
 Vue.component('mk-user-card', userCard);
 Vue.component('mk-note-detail', noteDetail);
 Vue.component('mk-follow-button', followButton);
+Vue.component('mk-mute-button', muteButton);
 Vue.component('mk-friends-maker', friendsMaker);
 Vue.component('mk-notification', notification);
 Vue.component('mk-notifications', notifications);

src/client/app/mobile/views/components/mute-button.vue

@@ -0,0 +1,79 @@
+<template>
+<button
+  class="mk-mute-button"
+  :class="{ active: user.isMuted }"
+  @click="onClick">
+  <span v-if="!user.isMuted">%fa:eye-slash% %i18n:@mute%</span>
+  <span v-else>%fa:eye% %i18n:@unmute%</span>
+</button>
+</template>
+
+<script lang="ts">
+import Vue from 'vue'
+export default Vue.extend({
+  props: {
+    user: {
+      type: Object,
+      required: true
+    }
+  },
+  methods: {
+    onClick() {
+      if (!this.user.isMuted) {
+        this.mute();
+      } else {
+        this.unmute();
+      }
+    },
+    mute() {
+      (this as any).api('mute/create', { userId: this.user.id})
+        .then(() => { this.user.isMuted = true })
+        .catch(() => { alert('error')})
+    },
+    unmute() {
+      (this as any).api('mute/delete', { userId: this.user.id })
+        .then(() => { this.user.isMuted = false })
+        .catch(() => { alert('error') })
+    }
+  },
+})
+</script>
+
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+.mk-mute-button
+  display block
+  user-select none 
+  cursor pointer
+  padding 0 16px
+  margin 0
+  min-width 100px
+  line-height 36px
+  font-size 14px
+  font-weight bold
+  color $theme-color
+  background transparent
+  outline none
+  border solid 1px $theme-color
+  border-radius 36px
+
+  &:hover
+    background rgba($theme-color, 0.1)
+
+  &:active
+    background rgba($theme-color, 0.2)
+
+  &.active
+    color $theme-color-foreground
+    background $theme-color
+
+    &:hover
+      background lighten($theme-color, 10%)
+      border-color lighten($theme-color, 10%)
+    &:active
+      background darken($theme-color, 10%)
+      border-color darken($theme-color, 10%)
+
+</style>

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

@@ -30,6 +30,7 @@
 				<ul>
 					<li><a @click="search">%fa:search%%i18n:@search%%fa:angle-right%</a></li>
 					<li><router-link to="/i/settings" :data-active="$route.name == 'settings'">%fa:cog%%i18n:@settings%%fa:angle-right%</router-link></li>
+					<li v-if="$store.getters.isSignedIn && $store.state.i.isAdmin"><router-link to="/admin">%fa:terminal%<span>%i18n:@admin%</span>%fa:angle-right%</router-link></li>
 					<li @click="dark"><p><template v-if="$store.state.device.darkmode">%fa:moon%</template><template v-else>%fa:R moon%</template><span>%i18n:@darkmode%</span></p></li>
 				</ul>
 			</div>
@@ -41,7 +42,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import { docsUrl, lang } from '../../../config';
+import { lang } from '../../../config';
 
 export default Vue.extend({
 	props: ['isOpen'],
@@ -50,7 +51,7 @@ export default Vue.extend({
 			hasGameInvitation: false,
 			connection: null,
 			connectionId: null,
-			aboutUrl: `${docsUrl}/${lang}/about`
+			aboutUrl: `/docs/${lang}/about`
 		};
 	},
 	computed: {

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

@@ -13,8 +13,9 @@
 				<ui-switch v-model="darkmode">%i18n:@dark-mode%</ui-switch>
 				<ui-switch v-model="$store.state.settings.circleIcons" @change="onChangeCircleIcons">%i18n:@circle-icons%</ui-switch>
 				<ui-switch v-model="$store.state.settings.iLikeSushi" @change="onChangeILikeSushi">%i18n:common.i-like-sushi%</ui-switch>
-				<ui-switch v-model="$store.state.settings.reversiBoardLabels" @change="onChangeReversiBoardLabels">%i18n:common.show-reversi-board-labels%</ui-switch>
 				<ui-switch v-model="$store.state.settings.disableAnimatedMfm" @change="onChangeDisableAnimatedMfm">%i18n:common.disable-animated-mfm%</ui-switch>
+				<ui-switch v-model="$store.state.settings.games.reversi.showBoardLabels" @change="onChangeReversiBoardLabels">%i18n:common.show-reversi-board-labels%</ui-switch>
+				<ui-switch v-model="$store.state.settings.games.reversi.useContrastStones" @change="onChangeUseContrastReversiStones">%i18n:common.use-contrast-reversi-stones%</ui-switch>
 
 				<div>
 					<div>%i18n:@timeline%</div>
@@ -189,7 +190,14 @@ export default Vue.extend({
 
 		onChangeReversiBoardLabels(v) {
 			this.$store.dispatch('settings/set', {
-				key: 'reversiBoardLabels',
+				key: 'games.reversi.showBoardLabels',
+				value: v
+			});
+		},
+
+		onChangeUseContrastReversiStones(v) {
+			this.$store.dispatch('settings/set', {
+				key: 'games.reversi.useContrastStones',
 				value: v
 			});
 		},

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

@@ -11,6 +11,7 @@
 					<a class="avatar">
 						<img :src="user.avatarUrl" alt="avatar"/>
 					</a>
+					<mk-mute-button v-if="$store.state.i.id != user.id" :user="user"/>
 					<mk-follow-button v-if="$store.getters.isSignedIn && $store.state.i.id != user.id" :user="user"/>
 				</div>
 				<div class="title">
@@ -184,6 +185,9 @@ root(isDark)
 							border 4px solid $bg
 							border-radius 12px
 
+				> .mk-mute-button
+					float right
+
 				> .mk-follow-button
 					float right
 

src/client/app/store.ts

@@ -1,5 +1,6 @@
 import Vuex from 'vuex';
 import createPersistedState from 'vuex-persistedstate';
+import * as nestedProperty from 'nested-property';
 
 import MiOS from './mios';
 import { hostname } from './config';
@@ -22,7 +23,12 @@ const defaultSettings = {
 	disableViaMobile: false,
 	memo: null,
 	iLikeSushi: false,
-	reversiBoardLabels: false
+	games: {
+		reversi: {
+			showBoardLabels: false,
+			useContrastStones: false
+		}
+	}
 };
 
 const defaultDeviceSettings = {
@@ -125,7 +131,7 @@ export default (os: MiOS) => new Vuex.Store({
 
 			mutations: {
 				set(state, x: { key: string; value: any }) {
-					state[x.key] = x.value;
+					nestedProperty.set(state, x.key, x.value);
 				},
 
 				setHome(state, data) {

src/docs/api/entities/drive-file.yaml

@@ -82,7 +82,7 @@ props:
       ja: "フォルダ"
       en: "The folder of this file"
 
-  sensitive:
+  isSensitive:
     type: "boolean"
     optional: true
     desc:

src/index.ts

@@ -14,6 +14,7 @@ import * as portscanner from 'portscanner';
 import isRoot = require('is-root');
 import Xev from 'xev';
 import * as program from 'commander';
+import mongo from './db/mongodb';
 
 import Logger from './misc/logger';
 import ProgressBar from './misc/cli/progressbar';
@@ -158,8 +159,13 @@ function checkMongoDb(config: Config) {
 	const p = config.mongodb.pass ? encodeURIComponent(config.mongodb.pass) : null;
 	const uri = `mongodb://${u && p ? `${u}:****@` : ''}${config.mongodb.host}:${config.mongodb.port}/${config.mongodb.db}`;
 	mongoDBLogger.info(`Connecting to ${uri}`);
-	require('./db/mongodb');
+
-	mongoDBLogger.succ('Connectivity confirmed');
+	mongo.then(() => {
+		mongoDBLogger.succ('Connectivity confirmed');
+	})
+	.catch(err => {
+		mongoDBLogger.error(err.message);
+	});
 }
 
 function spawnWorkers(limit: number) {

src/misc/i18n.ts

@@ -27,10 +27,12 @@ export default class Replacer {
 		let text = texts;
 
 		if (path) {
+			path = path.replace('.ts', '');
+
 			if (text.hasOwnProperty(path)) {
 				text = text[path];
 			} else {
-				if (this.lang === 'ja') console.warn(`path '${path}' not found`);
+				if (this.lang === 'ja-JP') console.warn(`path '${path}' not found`);
 				return key; // Fallback
 			}
 		}
@@ -46,10 +48,10 @@ export default class Replacer {
 		});
 
 		if (error) {
-			if (this.lang === 'ja') console.warn(`key '${key}' not found in '${path}'`);
+			if (this.lang === 'ja-JP') console.warn(`key '${key}' not found in '${path}'`);
 			return key; // Fallback
 		} else if (typeof text !== 'string') {
-			if (this.lang === 'ja') console.warn(`key '${key}' is not string in '${path}'`);
+			if (this.lang === 'ja-JP') console.warn(`key '${key}' is not string in '${path}'`);
 			return key; // Fallback
 		} else {
 			return text;

src/remote/activitypub/models/person.ts

@@ -131,7 +131,8 @@ export async function createPerson(value: any, resolver?: Resolver): Promise<IUs
 			endpoints: person.endpoints,
 			uri: person.id,
 			url: person.url,
-			isBot
+			isBot: isBot,
+			isCat: (person as any).isCat === true ? true : false
 		}) as IRemoteUser;
 	} catch (e) {
 		// duplicate key error
@@ -262,7 +263,8 @@ export async function updatePerson(value: string | IObject, resolver?: Resolver)
 			notesCount,
 			name: person.name,
 			url: person.url,
-			endpoints: person.endpoints
+			endpoints: person.endpoints,
+			isCat: (person as any).isCat === true ? true : false
 		}
 	});
 }

src/remote/activitypub/renderer/person.ts

@@ -29,6 +29,7 @@ export default async (user: ILocalUser) => {
 		icon: user.avatarId && renderImage(avatar),
 		image: user.bannerId && renderImage(banner),
 		manuallyApprovesFollowers: user.isLocked,
-		publicKey: renderKey(user)
+		publicKey: renderKey(user),
+		isCat: user.isCat
 	};
 };

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

@@ -0,0 +1,37 @@
+import $ from 'cafy';
+import Meta from '../../../../models/meta';
+import getParams from '../../get-params';
+
+export const meta = {
+	desc: {
+		ja: 'インスタンスの設定を更新します。'
+	},
+
+	requireCredential: true,
+	requireAdmin: true,
+
+	params: {
+		disableRegistration: $.bool.optional.nullable.note({
+			desc: {
+				ja: '招待制か否か'
+			}
+		}),
+	}
+};
+
+export default (params: any) => new Promise(async (res, rej) => {
+	const [ps, psErr] = getParams(meta, params);
+	if (psErr) return rej(psErr);
+
+	const set = {} as any;
+
+	if (ps.disableRegistration === true || ps.disableRegistration === false) {
+		set.disableRegistration = ps.disableRegistration;
+	}
+
+	await Meta.update({}, {
+		$set: set
+	}, { upsert: true });
+
+	res();
+});

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

@@ -34,9 +34,12 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
 	const sort = {
 		_id: -1
 	};
+
 	const query = {
-		'metadata.userId': user._id
+		'metadata.userId': user._id,
+		'metadata.deletedAt': { $exists: false }
 	} as any;
+
 	if (sinceId) {
 		sort._id = 1;
 		query._id = {
@@ -47,6 +50,7 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
 			$lt: untilId
 		};
 	}
+
 	if (type) {
 		query.contentType = new RegExp(`^${type.replace(/\*/g, '.+?')}$`);
 	}
@@ -59,6 +63,5 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
 		});
 
 	// Serialize
-	res(await Promise.all(files.map(async file =>
+	res(await Promise.all(files.map(file => pack(file))));
-		await pack(file))));
 });

src/server/api/private/signin.ts

@@ -12,8 +12,9 @@ export default async (ctx: Koa.Context) => {
 	ctx.set('Access-Control-Allow-Credentials', 'true');
 
 	const body = ctx.request.body as any;
-	const username = body['username'];
+	// See: https://github.com/syuilo/misskey/issues/2384
-	const password = body['password'];
+	const username = body['username'] || body['x'];
+	const password = body['password'] || body['y'];
 	const token = body['token'];
 
 	if (typeof username != 'string') {