10.20.0

New Crowdin translations (#2910 )
* New translations ja-JP.yml (German) * New translations ja-JP.yml (German) * New translations ja-JP.yml (German)
2018-10-16 11:44:35 +09:00 · 2018-10-16 11:38:43 +09:00 · 2018-10-16 11:38:09 +09:00 · 2018-10-16 10:46:45 +09:00 · 2018-10-16 10:46:38 +09:00 · 2018-10-16 10:36:27 +09:00
101 changed files with 2084 additions and 293 deletions
--- a/.travis/default.yml
+++ b/.travis/default.yml
@ -1,12 +1,8 @@
-maintainer: '@syuilo'
-url: 'https://misskey.xyz'
-secondary_url: 'https://himasaku.net'
+maintainer:
+  name: syuilo
+  url: 'https://syuilo.com'
+url: 'http://misskey.local'
 port: 80
-https:
-  enable: false
-  key: null
-  cert: null
-  ca: null
 mongodb:
  host: localhost
  port: 27017
@ -21,6 +17,3 @@ elasticsearch:
  host: localhost
  port: 9200
  pass: ''
-recaptcha:
-  site_key: hima
-  secret_key: saku
--- a/.travis/test.yml
+++ b/.travis/test.yml
@ -1,12 +1,8 @@
-maintainer: '@syuilo'
-url: 'https://misskey.xyz'
-secondary_url: 'https://himasaku.net'
+maintainer:
+  name: syuilo
+  url: 'https://syuilo.com'
+url: 'http://misskey.local'
 port: 80
-https:
-  enable: false
-  key: null
-  cert: null
-  ca: null
 mongodb:
  host: localhost
  port: 27017
@ -21,6 +17,3 @@ elasticsearch:
  host: localhost
  port: 9200
  pass: ''
-recaptcha:
-  site_key: hima
-  secret_key: saku
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@ -785,6 +785,10 @@ desktop/views/components/settings.vue:
  tools: "ツール"
  task-manager: "タスクマネージャ"
  third-parties: "サードパーティ"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
 desktop/views/components/settings.2fa.vue:
  intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
  detail: "詳細..."
@ -834,6 +838,7 @@ desktop/views/components/settings.profile.vue:
  save: "保存"
  locked-account: "アカウントの保護"
  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
  other: "その他"
  is-bot: "このアカウントはBotです"
  is-cat: "このアカウントはCatです"
@ -1074,6 +1079,8 @@ mobile/views/components/drive.file-detail.vue:
  hash: "ハッシュ (md5)"
  exif: "EXIF"
  nsfw: "閲覧注意"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
@ -1225,6 +1232,7 @@ mobile/views/pages/settings/settings.profile.vue:
  banner: "バナー"
  is-cat: "このアカウントはCatです"
  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
  advanced: "その他"
  privacy: "プライバシー"
  save: "保存"
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@ -3,16 +3,16 @@ meta:
  lang: "Deutsch"
  divider: ""
 common:
-  misskey: "A ⭐ of fediverse"
-  about-title: "A ⭐ of fediverse."
+  misskey: "Ein ⭐ des Fediversums"
+  about-title: "Ein ⭐ des Fediversums."
  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
  intro:
-    title: "Misskeyって？"
+    title: "Was ist Misskey?"
    about: "Misskeyはオープンソースの<b>分散型マイクロブログSNS</b>です。リッチで高度にカスタマイズできるUI、投稿へのリアクション、ファイルを一元管理できるドライブなど、先進的な機能を揃えています。また、Fediverseと呼ばれるネットワークに接続できるため、他のSNSともやり取りできます。例えば、あなたが何か投稿すると、その投稿はMisskeyだけでなく他のSNSにも伝わります。ちょうどある惑星から他の惑星に電波を発信している様子をイメージしてください。"
-    features: "特徴"
-    rich-contents: "投稿"
+    features: "Funktionen"
+    rich-contents: "Notizen"
    rich-contents-desc: "自分の考え、話題の出来事、皆と共有したいことについて発信してください。必要であれば、様々な構文を使って投稿を装飾したり、好きな画像、動画などのファイルやアンケートを添付することもできます。"
-    reaction: "リアクション"
+    reaction: "Reaktionen"
    reaction-desc: "あなたの気持ちを伝える最も簡単な方法です。Misskeyは、他のユーザーの投稿に様々なリアクションを付けることができます。いちどMisskeyのリアクション機能を体験してしまうと、もう「いいね」の概念しか存在しないSNSには戻れなくなるかもしれません。"
    ui: "インターフェース"
    ui-desc: "どのようなUIが使いやすいかは人それぞれです。だから、Misskeyは自由度の高いUIを持っています。レイアウトやデザインを調整したり、カスタマイズ可能な様々なウィジェットを配置したりして、自分だけのホームを作ってください。"
@ -23,7 +23,7 @@ common:
    detected: "広告ブロッカーを無効にしてください"
    warning: "<strong>Misskeyは広告を掲載していません</strong>が、広告をブロックする機能が有効だと一部の機能が利用できなかったり、不具合が発生する場合があります。"
  application-authorization: "アプリの連携"
-  close: "閉じる"
+  close: "Schließen"
  do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
  got-it: "わかった"
  customization-tips:
@ -34,13 +34,13 @@ common:
    paragraph4: "カスタマイズを終了するには、右上の「完了」をクリックします。"
    gotit: "Got it!"
  notification:
-    file-uploaded: "ファイルがアップロードされました"
+    file-uploaded: "Datei hochgeladen!"
    message-from: "{}さんからメッセージ:"
    reversi-invited: "対局への招待があります"
    reversi-invited-by: "{}さんから"
-    notified-by: "{}さんから"
-    reply-from: "{}さんから返信:"
-    quoted-by: "{}さんが引用:"
+    notified-by: "Benachrichtigt von {}:"
+    reply-from: "Antwort von {}:"
+    quoted-by: "Zitiert von {}:"
  time:
    unknown: "Unbekannt"
    future: "Zukunft"
@ -53,7 +53,7 @@ common:
    months_ago: "vor {0} Monat{0:en}"
    years_ago: "vor {} Jahr{0:en}"
  month-and-day: "{month}月 {day}日"
-  trash: "ゴミ箱"
+  trash: "Papierkorb"
  weekday-short:
    sunday: "So"
    monday: "Mo"
@ -63,13 +63,13 @@ common:
    friday: "Fr"
    saturday: "Sa"
  weekday:
-    sunday: "日曜日"
-    monday: "月曜日"
-    tuesday: "火曜日"
-    wednesday: "水曜日"
-    thursday: "木曜日"
-    friday: "金曜日"
-    saturday: "土曜日"
+    sunday: "Sonntag"
+    monday: "Montag"
+    tuesday: "Dienstag"
+    wednesday: "Mittwoch"
+    thursday: "Donnerstag"
+    friday: "Freitag"
+    saturday: "Samstag"
  reactions:
    like: "いいね"
    love: "Lieben"
@ -82,10 +82,10 @@ common:
    rip: "RIP"
    pudding: "Pudding"
  note-visibility:
-    public: "公開"
+    public: "Öffentlich"
    home: "ホーム"
    home-desc: "ホームタイムラインにのみ公開"
-    followers: "フォロワー"
+    followers: "Abonnenten"
    followers-desc: "自分のフォロワーにのみ公開"
    specified: "ダイレクト"
    specified-desc: "指定したユーザーにのみ公開"
@ -122,9 +122,9 @@ common:
    turn-of: "{}のターンです"
    past-turn-of: "{}のターン"
    won: "{}の勝ち"
-    black: "黒"
-    white: "白"
-    total: "合計"
+    black: "Schwarz"
+    white: "Weiß"
+    total: "Gesamt"
    this-turn: "{}ターン目"
  widgets:
    analog-clock: "Analoge Uhr"
@ -142,23 +142,23 @@ common:
    broadcast: "ブロードキャスト"
    notifications: "Benachrichtigungen"
    users: "Empfohlene Benutzer"
-    polls: "アンケート"
+    polls: "Umfrage"
    post-form: "Beitragsform"
    messaging: "Nachrichten"
    server: "Server-Info"
    donation: "Spenden"
    nav: "Navigation"
    tips: "Tipps"
-    hashtags: "ハッシュタグ"
+    hashtags: "Hashtags"
  deck:
    widgets: "Widget hinzufügen:"
    home: "Startseite"
    local: "Lokal"
    hybrid: "ソーシャル"
-    hashtag: "ハッシュタグ"
+    hashtag: "Hashtag"
    global: "Global"
-    mentions: "あなた宛て"
-    direct: "ダイレクト投稿"
+    mentions: "Erwähnungen"
+    direct: "Direktnachrichten"
    notifications: "Mitteilungen"
    list: "Listen"
    swap-left: "Nach links"
@ -182,10 +182,10 @@ auth/views/form.vue:
  drive-write: "ドライブを操作する。"
  notification-read: "通知を見る。"
  notification-write: "通知を操作する。"
-  cancel: "キャンセル"
-  accept: "アクセスを許可"
+  cancel: "Abbrechen"
+  accept: "Zugriff erlauben."
 auth/views/index.vue:
-  loading: "読み込み中"
+  loading: "Lädt"
  denied: "アプリケーションの連携をキャンセルしました。"
  denied-paragraph: "このアプリがあなたのアカウントにアクセスすることはありません。"
  already-authorized: "このアプリは既に連携済みです"
@ -196,10 +196,10 @@ auth/views/index.vue:
  sign-in: "サインインしてください"
 common/views/components/games/reversi/reversi.vue:
  matching:
-    waiting-for: "{}を待っています"
-    cancel: "キャンセル"
+    waiting-for: "Warten auf {}"
+    cancel: "Abbrechen"
 common/views/components/games/reversi/reversi.game.vue:
-  surrender: "投了"
+  surrender: "Aufgeben"
  surrendered: "投了により"
  is-llotheo: "石の少ない方が勝ち(ロセオ)"
  looped-map: "ループマップ"
@ -208,9 +208,9 @@ common/views/components/games/reversi/reversi.index.vue:
  title: "Misskey Reversi"
  sub-title: "他のMisskeyユーザーとリバーシで対戦しよう"
  invite: "招待"
-  rule: "遊び方"
+  rule: "Spielanleitung"
  rule-desc: "リバーシは、相手と交互に石をボードに置いて、相手の石を挟んで自分の色に変えてゆき、最終的に残った石が多い方が勝ちというボードゲームです。"
-  mode-invite: "招待"
+  mode-invite: "Einladen"
  mode-invite-desc: "指定したユーザーと対戦するモードです。"
  invitations: "対局の招待があります！"
  my-games: "自分の対局"
@ -785,6 +785,10 @@ desktop/views/components/settings.vue:
  tools: "Werkzeuge"
  task-manager: "Taskmanager"
  third-parties: "サードパーティ"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
 desktop/views/components/settings.2fa.vue:
  intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
  detail: "詳細..."
@ -834,6 +838,7 @@ desktop/views/components/settings.profile.vue:
  save: "Profil aktualisieren"
  locked-account: "アカウントの保護"
  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
  other: "その他"
  is-bot: "このアカウントはBotです"
  is-cat: "このアカウントはCatです"
@ -1074,6 +1079,8 @@ mobile/views/components/drive.file-detail.vue:
  hash: "ハッシュ (md5)"
  exif: "EXIF"
  nsfw: "閲覧注意"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
@ -1225,6 +1232,7 @@ mobile/views/pages/settings/settings.profile.vue:
  banner: "バナー"
  is-cat: "このアカウントはCatです"
  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
  advanced: "その他"
  privacy: "プライバシー"
  save: "保存"
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@ -785,6 +785,10 @@ desktop/views/components/settings.vue:
  tools: "Tools"
  task-manager: "Task Manager"
  third-parties: "Third-parties"
+  navbar-position: "Navigation bar position"
+  navbar-position-top: "Top"
+  navbar-position-left: "Left"
+  navbar-position-right: "Right"
 desktop/views/components/settings.2fa.vue:
  intro: "If you set up 2-step verification, you will not only need a password at sign-in, but also a pre-registered physical device (such as your smartphone), which will improve security."
  detail: "Details…"
@ -834,6 +838,7 @@ desktop/views/components/settings.profile.vue:
  save: "Update profile"
  locked-account: "Protect your account"
  is-locked: "Follow request needs approval"
+  careful-bot: "Botからのフォローだけ承認制にする"
  other: "Other"
  is-bot: "This account is a Bot"
  is-cat: "This account is a Cat"
@ -1074,6 +1079,8 @@ mobile/views/components/drive.file-detail.vue:
  hash: "Hash (md5)"
  exif: "EXIF"
  nsfw: "NSFW"
+  mark-as-sensitive: "Mark as 'sensitive'"
+  unmark-as-sensitive: "Unmark as 'sensitive'"
 mobile/views/components/media-image.vue:
  sensitive: "NSFW"
  click-to-show: "Click to show"
@ -1225,6 +1232,7 @@ mobile/views/pages/settings/settings.profile.vue:
  banner: "Banner"
  is-cat: "This account is a Cat"
  is-locked: "Follow request needs approval"
+  careful-bot: "Botからのフォローだけ承認制にする"
  advanced: "Advanced"
  privacy: "Privacy"
  save: "Update profile"
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@ -785,6 +785,10 @@ desktop/views/components/settings.vue:
  tools: "Herramientas"
  task-manager: "Navegador de tareas"
  third-parties: "Servicios externos"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
 desktop/views/components/settings.2fa.vue:
  intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
  detail: "Ver detalles..."
@ -834,6 +838,7 @@ desktop/views/components/settings.profile.vue:
  save: "Perfil actualizado"
  locked-account: "Protege tu cuenta"
  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
  other: "その他"
  is-bot: "このアカウントはBotです"
  is-cat: "このアカウントはCatです"
@ -1074,6 +1079,8 @@ mobile/views/components/drive.file-detail.vue:
  hash: "ハッシュ (md5)"
  exif: "EXIF"
  nsfw: "閲覧注意"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
@ -1225,6 +1232,7 @@ mobile/views/pages/settings/settings.profile.vue:
  banner: "バナー"
  is-cat: "このアカウントはCatです"
  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
  advanced: "その他"
  privacy: "プライバシー"
  save: "保存"
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@ -785,6 +785,10 @@ desktop/views/components/settings.vue:
  tools: "Outils"
  task-manager: "Gestionnaire de tâches"
  third-parties: "Services tiers"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
 desktop/views/components/settings.2fa.vue:
  intro: "Si vous configurez la vérication en deux étapes vous aurez non seulement besoin de votre mot de passe mais aussi un appareil déjà pré-enregistré(tel que votre smartphone) ce qui ameliora grandement la sécurité de votre compte."
  detail: "Voir les détails..."
@ -834,6 +838,7 @@ desktop/views/components/settings.profile.vue:
  save: "Mettre à jour le profil"
  locked-account: "Protéger votre compte"
  is-locked: "Demande d’abonnement en attente d’approbation"
+  careful-bot: "Botからのフォローだけ承認制にする"
  other: "Autre"
  is-bot: "Ce compte est un Bot"
  is-cat: "Ce compte est un Chat"
@ -1074,6 +1079,8 @@ mobile/views/components/drive.file-detail.vue:
  hash: "Hash (md5)"
  exif: "EXIF"
  nsfw: "CW"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
  sensitive: "Le contenu est NSFW"
  click-to-show: "Cliquer pour afficher"
@ -1225,6 +1232,7 @@ mobile/views/pages/settings/settings.profile.vue:
  banner: "Bannière"
  is-cat: "Ce compte est un Bot"
  is-locked: "Demande d’abonnement en attente d’approbation"
+  careful-bot: "Botからのフォローだけ承認制にする"
  advanced: "Avancé"
  privacy: "Vie privée"
  save: "Mettre à jour le profil"
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@ -785,6 +785,10 @@ desktop/views/components/settings.vue:
  tools: "ツール"
  task-manager: "タスクマネージャ"
  third-parties: "サードパーティ"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
 desktop/views/components/settings.2fa.vue:
  intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
  detail: "詳細..."
@ -834,6 +838,7 @@ desktop/views/components/settings.profile.vue:
  save: "保存"
  locked-account: "アカウントの保護"
  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
  other: "その他"
  is-bot: "このアカウントはBotです"
  is-cat: "このアカウントはCatです"
@ -1074,6 +1079,8 @@ mobile/views/components/drive.file-detail.vue:
  hash: "ハッシュ (md5)"
  exif: "EXIF"
  nsfw: "閲覧注意"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
@ -1225,6 +1232,7 @@ mobile/views/pages/settings/settings.profile.vue:
  banner: "バナー"
  is-cat: "このアカウントはCatです"
  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
  advanced: "その他"
  privacy: "プライバシー"
  save: "保存"
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@ -883,6 +883,11 @@ desktop/views/components/settings.vue:
  task-manager: "タスクマネージャ"
  third-parties: "サードパーティ"

+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
+
 desktop/views/components/settings.2fa.vue:
  intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
  detail: "詳細..."
@ -1234,6 +1239,8 @@ mobile/views/components/drive.file-detail.vue:
  hash: "ハッシュ (md5)"
  exif: "EXIF"
  nsfw: "閲覧注意"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"

 mobile/views/components/media-image.vue:
  sensitive: "閲覧注意"
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@ -785,6 +785,10 @@ desktop/views/components/settings.vue:
  tools: "ツール"
  task-manager: "タスクマネージャ"
  third-parties: "サードパーティ"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
 desktop/views/components/settings.2fa.vue:
  intro: "二段階認証を設定すると、サインイン時にパスワードだけとちゃうくて、予め登録しておいた物理的なデバイス(例えばあんさんのスマートフォンなど)も必要になり、よりセキュリティが向上すんで。"
  detail: "詳細..."
@ -834,6 +838,7 @@ desktop/views/components/settings.profile.vue:
  save: "保存"
  locked-account: "アカウント守る"
  is-locked: "他人のフォローは許可してからや！"
+  careful-bot: "Botからのフォローだけ承認制にする"
  other: "その他"
  is-bot: "このアカウントはBotやで"
  is-cat: "このアカウントはCatやで"
@ -1074,6 +1079,8 @@ mobile/views/components/drive.file-detail.vue:
  hash: "ハッシュ(md5)"
  exif: "EXIF"
  nsfw: "ちょっと見せられへんわ"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
  sensitive: "見たらあかんで"
  click-to-show: "押してみ、見せたるわ"
@ -1225,6 +1232,7 @@ mobile/views/pages/settings/settings.profile.vue:
  banner: "バナー"
  is-cat: "このアカウントはCatや"
  is-locked: "他人のフォローは許可してからや！"
+  careful-bot: "Botからのフォローだけ承認制にする"
  advanced: "その他"
  privacy: "プライバシーってなんや？オカンの年齢か？"
  save: "保存"
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@ -785,6 +785,10 @@ desktop/views/components/settings.vue:
  tools: "ツール"
  task-manager: "タスクマネージャ"
  third-parties: "サードパーティ"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
 desktop/views/components/settings.2fa.vue:
  intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
  detail: "詳細..."
@ -834,6 +838,7 @@ desktop/views/components/settings.profile.vue:
  save: "保存"
  locked-account: "アカウントの保護"
  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
  other: "その他"
  is-bot: "このアカウントはBotです"
  is-cat: "このアカウントはCatです"
@ -1074,6 +1079,8 @@ mobile/views/components/drive.file-detail.vue:
  hash: "ハッシュ (md5)"
  exif: "EXIF"
  nsfw: "閲覧注意"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
@ -1225,6 +1232,7 @@ mobile/views/pages/settings/settings.profile.vue:
  banner: "バナー"
  is-cat: "このアカウントはCatです"
  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
  advanced: "その他"
  privacy: "プライバシー"
  save: "保存"
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@ -785,6 +785,10 @@ desktop/views/components/settings.vue:
  tools: "Hulpmiddelen"
  task-manager: "Taakbeheer"
  third-parties: "Derde partij"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
 desktop/views/components/settings.2fa.vue:
  intro: "Als je verificatie in twee stappen instelt, dan heb je niet alleen een wachtwoord nodig bij het inloggen, maar ook een geregistreerd fysiek apparaat (zoals je smartphone). Dit verhoogt de veiligheid. "
  detail: "Details bekijken..."
@ -834,6 +838,7 @@ desktop/views/components/settings.profile.vue:
  save: "Profiel bijwerken"
  locked-account: "アカウントの保護"
  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
  other: "その他"
  is-bot: "Dit account is een Bot"
  is-cat: "Dit account is een Kat"
@ -1074,6 +1079,8 @@ mobile/views/components/drive.file-detail.vue:
  hash: "Hash (md5)"
  exif: "EXIF"
  nsfw: "閲覧注意"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
@ -1225,6 +1232,7 @@ mobile/views/pages/settings/settings.profile.vue:
  banner: "Omslagfoto"
  is-cat: "Dit account is een Kat"
  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
  advanced: "その他"
  privacy: "プライバシー"
  save: "Profiel bijwerken"
--- a/locales/no-NO.yml
+++ b/locales/no-NO.yml
@ -785,6 +785,10 @@ desktop/views/components/settings.vue:
  tools: "Verktøy"
  task-manager: "タスクマネージャ"
  third-parties: "サードパーティ"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
 desktop/views/components/settings.2fa.vue:
  intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
  detail: "Detaljer..."
@ -834,6 +838,7 @@ desktop/views/components/settings.profile.vue:
  save: "Lagre profilen"
  locked-account: "アカウントの保護"
  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
  other: "Annet"
  is-bot: "このアカウントはBotです"
  is-cat: "このアカウントはCatです"
@ -1074,6 +1079,8 @@ mobile/views/components/drive.file-detail.vue:
  hash: "ハッシュ (md5)"
  exif: "EXIF"
  nsfw: "NSFW"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
  sensitive: "NSFW"
  click-to-show: "クリックして表示"
@ -1225,6 +1232,7 @@ mobile/views/pages/settings/settings.profile.vue:
  banner: "Banner"
  is-cat: "このアカウントはCatです"
  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
  advanced: "Avansert"
  privacy: "プライバシー"
  save: "Lagre profilen"
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@ -785,6 +785,10 @@ desktop/views/components/settings.vue:
  tools: "Narzędzia"
  task-manager: "Menedżer zadań"
  third-parties: "Autorzy trzeci"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
 desktop/views/components/settings.2fa.vue:
  intro: "Jeżeli skonfigurujesz uwierzytelnianie dwuetapowe, aby zablokować się będziesz potrzebować (oprócz hasła) kodu ze skonfigurowanego urządzenia (np. smartfonu), co zwiększy bezpieczeństwo."
  detail: "Zobacz szczegóły…"
@ -834,6 +838,7 @@ desktop/views/components/settings.profile.vue:
  save: "Aktualizuj profil"
  locked-account: "Zabezpiecz swoje konto"
  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
  other: "Inne"
  is-bot: "To konto jest prowadzone przez bota"
  is-cat: "To konto jest prowadzone przez kota"
@ -1074,6 +1079,8 @@ mobile/views/components/drive.file-detail.vue:
  hash: "Hash (md5)"
  exif: "EXIF"
  nsfw: "閲覧注意"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
  sensitive: "To jest zawartość NSFW"
  click-to-show: "Naciśnij aby wyświetlić"
@ -1225,6 +1232,7 @@ mobile/views/pages/settings/settings.profile.vue:
  banner: "Baner"
  is-cat: "To konto jest prowadzone przez kota"
  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
  advanced: "その他"
  privacy: "プライバシー"
  save: "Aktualizuj profil"
--- a/locales/pt-PT.yml
+++ b/locales/pt-PT.yml
@ -785,6 +785,10 @@ desktop/views/components/settings.vue:
  tools: "ツール"
  task-manager: "タスクマネージャ"
  third-parties: "サードパーティ"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
 desktop/views/components/settings.2fa.vue:
  intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
  detail: "詳細..."
@ -834,6 +838,7 @@ desktop/views/components/settings.profile.vue:
  save: "保存"
  locked-account: "アカウントの保護"
  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
  other: "その他"
  is-bot: "このアカウントはBotです"
  is-cat: "このアカウントはCatです"
@ -1074,6 +1079,8 @@ mobile/views/components/drive.file-detail.vue:
  hash: "ハッシュ (md5)"
  exif: "EXIF"
  nsfw: "閲覧注意"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
@ -1225,6 +1232,7 @@ mobile/views/pages/settings/settings.profile.vue:
  banner: "Capa"
  is-cat: "Esta conta é gato"
  is-locked: "Pedido para seguir precisa ser aprovado"
+  careful-bot: "Botからのフォローだけ承認制にする"
  advanced: "Avançado"
  privacy: "Provacidade"
  save: "Atualizar perfil"
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@ -3,9 +3,9 @@ meta:
  lang: "Русский язык"
  divider: ""
 common:
-  misskey: "A ⭐ of fediverse"
-  about-title: "A ⭐ of fediverse."
-  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
+  misskey: "Мы — ⭐ fediverse"
+  about-title: "Мы — ⭐ fediverse"
+  about: "Спасибо, что нашли Misskey. Misskey — это <b>децентрализованная платформа для микроблоггинга</b> родом с планеты Земля. Поскольку она существует внутри Fediverse (вселенной различных социальных платформ), она связана с другими платформами. Отдохните от шума большого города — и познакомьтесь с новым интернетом."
  intro:
    title: "Misskeyって？"
    about: "Misskeyはオープンソースの<b>分散型マイクロブログSNS</b>です。リッチで高度にカスタマイズできるUI、投稿へのリアクション、ファイルを一元管理できるドライブなど、先進的な機能を揃えています。また、Fediverseと呼ばれるネットワークに接続できるため、他のSNSともやり取りできます。例えば、あなたが何か投稿すると、その投稿はMisskeyだけでなく他のSNSにも伝わります。ちょうどある惑星から他の惑星に電波を発信している様子をイメージしてください。"
@ -785,6 +785,10 @@ desktop/views/components/settings.vue:
  tools: "ツール"
  task-manager: "タスクマネージャ"
  third-parties: "サードパーティ"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
 desktop/views/components/settings.2fa.vue:
  intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
  detail: "詳細..."
@ -834,6 +838,7 @@ desktop/views/components/settings.profile.vue:
  save: "保存"
  locked-account: "アカウントの保護"
  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
  other: "その他"
  is-bot: "このアカウントはBotです"
  is-cat: "このアカウントはCatです"
@ -1074,6 +1079,8 @@ mobile/views/components/drive.file-detail.vue:
  hash: "ハッシュ (md5)"
  exif: "EXIF"
  nsfw: "閲覧注意"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
@ -1225,6 +1232,7 @@ mobile/views/pages/settings/settings.profile.vue:
  banner: "バナー"
  is-cat: "このアカウントはCatです"
  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
  advanced: "その他"
  privacy: "プライバシー"
  save: "保存"
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@ -785,6 +785,10 @@ desktop/views/components/settings.vue:
  tools: "ツール"
  task-manager: "タスクマネージャ"
  third-parties: "サードパーティ"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
 desktop/views/components/settings.2fa.vue:
  intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
  detail: "詳細..."
@ -834,6 +838,7 @@ desktop/views/components/settings.profile.vue:
  save: "保存"
  locked-account: "アカウントの保護"
  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
  other: "その他"
  is-bot: "このアカウントはBotです"
  is-cat: "このアカウントはCatです"
@ -1074,6 +1079,8 @@ mobile/views/components/drive.file-detail.vue:
  hash: "ハッシュ (md5)"
  exif: "EXIF"
  nsfw: "閲覧注意"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
@ -1225,6 +1232,7 @@ mobile/views/pages/settings/settings.profile.vue:
  banner: "バナー"
  is-cat: "このアカウントはCatです"
  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
  advanced: "その他"
  privacy: "プライバシー"
  save: "保存"
--- a/package.json
+++ b/package.json
@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "10.13.0",
-	"clientVersion": "1.0.10517",
+	"version": "10.20.0",
+	"clientVersion": "1.0.10607",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
@ -28,6 +28,7 @@
 		"@prezzemolo/rap": "0.1.2",
 		"@prezzemolo/zip": "0.0.3",
 		"@types/bcryptjs": "2.4.2",
+		"@types/chai-http": "3.0.5",
 		"@types/dateformat": "1.0.1",
 		"@types/debug": "0.0.31",
 		"@types/deep-equal": "1.0.1",
@ -39,7 +40,7 @@
 		"@types/gulp-mocha": "0.0.32",
 		"@types/gulp-rename": "0.0.33",
 		"@types/gulp-replace": "0.0.31",
-		"@types/gulp-uglify": "3.0.5",
+		"@types/gulp-uglify": "3.0.6",
 		"@types/gulp-util": "3.0.34",
 		"@types/is-root": "1.0.0",
 		"@types/is-url": "1.2.28",
@ -60,7 +61,7 @@
 		"@types/mocha": "5.2.3",
 		"@types/mongodb": "3.1.12",
 		"@types/ms": "0.7.30",
-		"@types/node": "10.11.7",
+		"@types/node": "10.12.0",
 		"@types/portscanner": "2.1.0",
 		"@types/pug": "2.0.4",
 		"@types/qrcode": "1.3.0",
@ -70,7 +71,7 @@
 		"@types/request-promise-native": "1.0.15",
 		"@types/rimraf": "2.0.2",
 		"@types/seedrandom": "2.4.27",
-		"@types/sharp": "0.17.10",
+		"@types/sharp": "0.21.0",
 		"@types/showdown": "1.7.5",
 		"@types/single-line-log": "1.1.0",
 		"@types/speakeasy": "2.0.2",
@ -78,7 +79,7 @@
 		"@types/tinycolor2": "1.4.1",
 		"@types/tmp": "0.0.33",
 		"@types/uuid": "3.4.4",
-		"@types/webpack": "4.4.16",
+		"@types/webpack": "4.4.17",
 		"@types/webpack-stream": "3.2.10",
 		"@types/websocket": "0.0.40",
 		"@types/ws": "6.0.1",
@ -90,8 +91,10 @@
 		"bee-queue": "1.2.2",
 		"bootstrap-vue": "2.0.0-rc.11",
 		"cafy": "11.3.0",
+		"chai": "4.2.0",
+		"chai-http": "4.2.0",
 		"chalk": "2.4.1",
-		"chart.js": "2.7.2",
+		"chart.js": "2.7.3",
 		"commander": "2.19.0",
 		"crc-32": "1.2.0",
 		"css-loader": "1.0.0",
@ -157,7 +160,7 @@
 		"mkdirp": "0.5.1",
 		"mocha": "5.2.0",
 		"moji": "0.5.1",
-		"mongodb": "3.1.1",
+		"mongodb": "3.1.8",
 		"monk": "6.0.6",
 		"ms": "2.1.1",
 		"nan": "2.11.1",
@ -213,13 +216,14 @@
 		"vue": "2.5.17",
 		"vue-chartjs": "3.4.0",
 		"vue-color": "2.7.0",
+		"vue-content-loading": "1.5.3",
 		"vue-cropperjs": "2.2.2",
 		"vue-js-modal": "1.3.26",
 		"vue-json-tree-view": "2.1.4",
 		"vue-loader": "15.4.2",
 		"vue-router": "3.0.1",
 		"vue-style-loader": "4.1.2",
-		"vue-svg-inline-loader": "1.2.0",
+		"vue-svg-inline-loader": "1.2.1",
 		"vue-sweetalert2": "1.5.5",
 		"vue-template-compiler": "2.5.17",
 		"vuedraggable": "2.16.0",
--- a/src/client/app/common/scripts/stream.ts
+++ b/src/client/app/common/scripts/stream.ts
@ -9,7 +9,7 @@ import MiOS from '../../mios';
 */
 export default class Stream extends EventEmitter {
 	private stream: ReconnectingWebsocket;
-	private state: string;
+	public state: string;
 	private sharedConnectionPools: Pool[] = [];
 	private sharedConnections: SharedConnection[] = [];
 	private nonSharedConnections: NonSharedConnection[] = [];
--- a/src/client/app/common/views/components/index.ts
+++ b/src/client/app/common/views/components/index.ts
@ -1,5 +1,6 @@
 import Vue from 'vue';

+import noteSkeleton from './note-skeleton.vue';
 import theme from './theme.vue';
 import instance from './instance.vue';
 import cwButton from './cw-button.vue';
@ -44,6 +45,7 @@ import uiSelect from './ui/select.vue';
 import formButton from './ui/form/button.vue';
 import formRadio from './ui/form/radio.vue';

+Vue.component('mk-note-skeleton', noteSkeleton);
 Vue.component('mk-theme', theme);
 Vue.component('mk-instance', instance);
 Vue.component('mk-cw-button', cwButton);
--- a/src/client/app/common/views/components/misskey-flavored-markdown.ts
+++ b/src/client/app/common/views/components/misskey-flavored-markdown.ts
@ -116,16 +116,16 @@ export default Vue.component('misskey-flavored-markdown', {
 				case 'mention': {
 					return (createElement as any)('a', {
 						attrs: {
-							href: `${url}/@${getAcct(token)}`,
+							href: `${url}/${token.canonical}`,
 							target: '_blank',
 							dataIsMe: (this as any).i && getAcct((this as any).i) == getAcct(token),
 							style: 'color:var(--mfmMention);'
 						},
 						directives: [{
 							name: 'user-preview',
-							value: token.content
+							value: token.canonical
 						}]
-					}, token.content);
+					}, token.canonical);
 				}

 				case 'hashtag': {
--- a/src/client/app/common/views/components/note-skeleton.vue
+++ b/src/client/app/common/views/components/note-skeleton.vue
@ -0,0 +1,52 @@
+<template>
+<div>
+	<vue-content-loading v-if="width" :width="width" :height="100" :primary="primary" :secondary="secondary">
+		<circle cx="30" cy="30" r="30" />
+		<rect x="75" y="13" rx="4" ry="4" :width="150 + r1" height="15" />
+		<rect x="75" y="39" rx="4" ry="4" :width="260 + r2" height="10" />
+		<rect x="75" y="59" rx="4" ry="4" :width="230 + r3" height="10" />
+	</vue-content-loading>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import VueContentLoading from 'vue-content-loading';
+import * as tinycolor from 'tinycolor2';
+
+export default Vue.extend({
+	components: {
+		VueContentLoading,
+	},
+
+	data() {
+		return {
+			width: 0,
+			r1: (Math.random() * 100) - 50,
+			r2: (Math.random() * 100) - 50,
+			r3: (Math.random() * 100) - 50
+		};
+	},
+
+	computed: {
+		text(): tinycolor.Instance {
+			const text = tinycolor(getComputedStyle(document.documentElement).getPropertyValue('--text'));
+			return text;
+		},
+
+		primary(): string {
+			return '#' + this.text.clone().toHex();
+		},
+
+		secondary(): string {
+			return '#' + this.text.clone().darken(20).toHex();
+		}
+	},
+
+	mounted() {
+		let width = this.$el.clientWidth;
+		if (width < 400) width = 400;
+		this.width = width;
+	}
+});
+</script>
--- a/src/client/app/common/views/directives/autocomplete.ts
+++ b/src/client/app/common/views/directives/autocomplete.ts
@ -1,6 +1,6 @@
 import * as getCaretCoordinates from 'textarea-caret';
 import MkAutocomplete from '../components/autocomplete.vue';
-import renderAcct from '../../../../../misc/acct/render';
+import { toASCII } from 'punycode';

 export default {
 	bind(el, binding, vn) {
@ -188,7 +188,7 @@ class Autocomplete {
 			const trimmedBefore = before.substring(0, before.lastIndexOf('@'));
 			const after = source.substr(caret);

-			const acct = renderAcct(value);
+			const acct = value.host === null ? value.username : `${value.username}@${toASCII(value.host)}`;

 			// 挿入
 			this.text = `${trimmedBefore}@${acct} ${after}`;
--- a/src/client/app/desktop/views/components/ellipsis-icon.vue
+++ b/src/client/app/desktop/views/components/ellipsis-icon.vue
@ -1,37 +0,0 @@
-<template>
-<div class="mk-ellipsis-icon">
-	<div></div><div></div><div></div>
-</div>
-</template>
-
-<style lang="stylus" scoped>
-.mk-ellipsis-icon
-	width 70px
-	margin 0 auto
-	text-align center
-
-	> div
-		display inline-block
-		width 18px
-		height 18px
-		background-color rgba(#000, 0.3)
-		border-radius 100%
-		animation bounce 1.4s infinite ease-in-out both
-
-		&:nth-child(1)
-			animation-delay 0s
-
-		&:nth-child(2)
-			margin 0 6px
-			animation-delay 0.16s
-
-		&:nth-child(3)
-			animation-delay 0.32s
-
-	@keyframes bounce
-		0%, 80%, 100%
-			transform scale(0)
-		40%
-			transform scale(1)
-
-</style>
--- a/src/client/app/desktop/views/components/home.vue
+++ b/src/client/app/desktop/views/components/home.vue
@ -38,7 +38,7 @@
 			</div>
 		</div>
 	</div>
-	<div class="main">
+	<div class="main" :class="{ side: widgets.left.length == 0 || widgets.right.length == 0 }">
 		<template v-if="customize">
 			<x-draggable v-for="place in ['left', 'right']"
 				:list="widgets[place]"
@ -359,12 +359,10 @@ export default Vue.extend({
 				box-shadow var(--shadow)
 				border-radius var(--round)

-			@media (max-width 700px)
-				padding 0
-
-				> .tl
-					border none
-					border-radius 0
+		&.side
+			> .main
+				width calc(100% - 280px)
+				max-width 680px

 		> *:not(.main)
 			width 280px
@ -381,12 +379,22 @@ export default Vue.extend({
 			padding-right 16px
 			order 3

-		@media (max-width 1100px)
+		&.side
+			@media (max-width 1000px)
+				> *:not(.main)
+					display none
+
+				> .main
+					width 100%
+					max-width 700px
+					margin 0 auto
+
+		&:not(.side)
+			@media (max-width 1200px)
 				> *:not(.main)
 					display none

 				> .main
-				float none
 					width 100%
 					max-width 700px
 					margin 0 auto
--- a/src/client/app/desktop/views/components/index.ts
+++ b/src/client/app/desktop/views/components/index.ts
@ -9,7 +9,6 @@ import subNoteContent from './sub-note-content.vue';
 import window from './window.vue';
 import noteFormWindow from './post-form-window.vue';
 import renoteFormWindow from './renote-form-window.vue';
-import ellipsisIcon from './ellipsis-icon.vue';
 import mediaImage from './media-image.vue';
 import mediaImageDialog from './media-image-dialog.vue';
 import mediaVideo from './media-video.vue';
@ -39,7 +38,6 @@ Vue.component('mk-sub-note-content', subNoteContent);
 Vue.component('mk-window', window);
 Vue.component('mk-post-form-window', noteFormWindow);
 Vue.component('mk-renote-form-window', renoteFormWindow);
-Vue.component('mk-ellipsis-icon', ellipsisIcon);
 Vue.component('mk-media-image', mediaImage);
 Vue.component('mk-media-image-dialog', mediaImageDialog);
 Vue.component('mk-media-video', mediaVideo);
--- a/src/client/app/desktop/views/components/notes.vue
+++ b/src/client/app/desktop/views/components/notes.vue
@ -9,6 +9,12 @@
 		<button @click="resolveInitPromise">%i18n:@retry%</button>
 	</div>

+	<div class="placeholder" v-if="fetching">
+		<template v-for="i in 10">
+			<mk-note-skeleton :key="i"/>
+		</template>
+	</div>
+
 	<!-- トランジションを有効にするとなぜかメモリリークする -->
 	<component :is="!$store.state.device.reduceMotion ? 'transition-group' : 'div'" name="mk-notes" class="notes transition" tag="div" ref="notes">
 		<template v-for="(note, i) in _notes">
@ -226,6 +232,10 @@ export default Vue.extend({
 		> *
 			transition transform .3s ease, opacity .3s ease

+	> .placeholder
+		padding 32px
+		opacity 0.3
+
 	> .notes
 		> .date
 			display block
--- a/src/client/app/desktop/views/components/notifications.vue
+++ b/src/client/app/desktop/views/components/notifications.vue
@ -1,5 +1,11 @@
 <template>
 <div class="mk-notifications">
+	<div class="placeholder" v-if="fetching">
+		<template v-for="i in 10">
+			<mk-note-skeleton :key="i"/>
+		</template>
+	</div>
+
 	<div class="notifications" v-if="notifications.length != 0">
 		<!-- トランジションを有効にするとなぜかメモリリークする -->
 		<component :is="!$store.state.device.reduceMotion ? 'transition-group' : 'div'" name="mk-notifications" class="transition" tag="div">
@ -102,7 +108,6 @@
 		<template v-if="fetchingMoreNotifications">%fa:spinner .pulse .fw%</template>{{ fetchingMoreNotifications ? '%i18n:common.loading%' : '%i18n:@more%' }}
 	</button>
 	<p class="empty" v-if="notifications.length == 0 && !fetching">%i18n:@empty%</p>
-	<p class="loading" v-if="fetching">%fa:spinner .pulse .fw%%i18n:common.loading%<mk-ellipsis/></p>
 </div>
 </template>

@ -202,6 +207,10 @@ export default Vue.extend({
 		> *
 			transition transform .3s ease, opacity .3s ease

+	> .placeholder
+		padding 16px
+		opacity 0.3
+
 	> .notifications
 		> div
 			> .notification
@ -319,13 +328,4 @@ export default Vue.extend({
 		text-align center
 		color #aaa

-	> .loading
-		margin 0
-		padding 16px
-		text-align center
-		color #aaa
-
-		> [data-fa]
-			margin-right 4px
-
 </style>
--- a/src/client/app/desktop/views/components/post-form.vue
+++ b/src/client/app/desktop/views/components/post-form.vue
@ -65,6 +65,7 @@ import { host } from '../../../config';
 import { erase, unique } from '../../../../../prelude/array';
 import { length } from 'stringz';
 import parseAcct from '../../../../../misc/acct/parse';
+import { toASCII } from 'punycode';

 export default Vue.extend({
 	components: {
@ -158,14 +159,14 @@ export default Vue.extend({
 		}

 		if (this.reply && this.reply.user.host != null) {
-			this.text = `@${this.reply.user.username}@${this.reply.user.host} `;
+			this.text = `@${this.reply.user.username}@${toASCII(this.reply.user.host)} `;
 		}

 		if (this.reply && this.reply.text != null) {
 			const ast = parse(this.reply.text);

 			ast.filter(t => t.type == 'mention').forEach(x => {
-				const mention = x.host ? `@${x.username}@${x.host}` : `@${x.username}`;
+				const mention = x.host ? `@${x.username}@${toASCII(x.host)}` : `@${x.username}`;

 				// 自分は除外
 				if (this.$store.state.i.username == x.username && x.host == null) return;
--- a/src/client/app/desktop/views/components/settings.vue
+++ b/src/client/app/desktop/views/components/settings.vue
@ -88,6 +88,13 @@
 			<ui-switch v-model="disableAnimatedMfm">%i18n:common.disable-animated-mfm%</ui-switch>
 			<ui-switch v-model="games_reversi_showBoardLabels">%i18n:common.show-reversi-board-labels%</ui-switch>
 			<ui-switch v-model="games_reversi_useContrastStones">%i18n:common.use-contrast-reversi-stones%</ui-switch>
+
+			<section>
+				<header>%i18n:@navbar-position%</header>
+				<ui-radio v-model="navbar" value="top">%i18n:@navbar-position-top%</ui-radio>
+				<ui-radio v-model="navbar" value="left">%i18n:@navbar-position-left%</ui-radio>
+				<ui-radio v-model="navbar" value="right">%i18n:@navbar-position-right%</ui-radio>
+			</section>
 		</section>

 		<section class="web" v-show="page == 'web'">
@ -293,6 +300,11 @@ export default Vue.extend({
 			set(value) { this.$store.commit('device/set', { key: 'darkmode', value }); }
 		},

+		navbar: {
+			get() { return this.$store.state.device.navbar; },
+			set(value) { this.$store.commit('device/set', { key: 'navbar', value }); }
+		},
+
 		enableSounds: {
 			get() { return this.$store.state.device.enableSounds; },
 			set(value) { this.$store.commit('device/set', { key: 'enableSounds', value }); }
--- a/src/client/app/desktop/views/components/timeline.core.vue
+++ b/src/client/app/desktop/views/components/timeline.core.vue
@ -1,9 +1,6 @@
 <template>
 <div class="mk-timeline-core">
 	<mk-friends-maker v-if="src == 'home' && alone"/>
-	<div class="fetching" v-if="fetching">
-		<mk-ellipsis-icon/>
-	</div>

 	<mk-notes ref="timeline" :more="existMore ? more : null">
 		<p :class="$style.empty" slot="empty">
@ -170,15 +167,10 @@ export default Vue.extend({
 </script>

 <style lang="stylus" scoped>
-
-
 .mk-timeline-core
 	> .mk-friends-maker
 		border-bottom solid 1px #eee

-	> .fetching
-		padding 64px 0
-
 </style>

 <style lang="stylus" module>
--- a/src/client/app/desktop/views/components/ui.header.account.vue
+++ b/src/client/app/desktop/views/components/ui.header.account.vue
@ -157,6 +157,9 @@ export default Vue.extend({
 			font-family Meiryo, sans-serif
 			text-decoration none

+			@media (max-width 1100px)
+				display none
+
 			[data-fa]
 				margin-left 8px

@ -171,6 +174,9 @@ export default Vue.extend({
 			border-radius 4px
 			transition filter 100ms ease

+			@media (max-width 1100px)
+				margin-left 8px
+
 	> .menu
 		$bgcolor = var(--face)
 		display block
--- a/src/client/app/desktop/views/components/ui.header.post.vue
+++ b/src/client/app/desktop/views/components/ui.header.post.vue
@ -17,8 +17,6 @@ export default Vue.extend({
 </script>

 <style lang="stylus" scoped>
-
-
 .note
 	display inline-block
 	padding 8px
--- a/src/client/app/desktop/views/components/ui.header.search.vue
+++ b/src/client/app/desktop/views/components/ui.header.search.vue
@ -29,6 +29,9 @@ export default Vue.extend({

 <style lang="stylus" scoped>
 .search
+	@media (max-width 800px)
+		display none !important
+
 	> [data-fa]
 		display block
 		position absolute
@ -58,6 +61,9 @@ export default Vue.extend({
 		transition color 0.5s ease, border 0.5s ease
 		color var(--desktopHeaderSearchFg)

+		@media (max-width 1000px)
+			width 10em
+
 		&::placeholder
 			color var(--desktopHeaderFg)

--- a/src/client/app/desktop/views/components/ui.sidebar.vue
+++ b/src/client/app/desktop/views/components/ui.sidebar.vue
@ -0,0 +1,368 @@
+<template>
+<div class="header" :class="navbar">
+	<div class="body">
+		<div class="post">
+			<button @click="post" title="%i18n:@post%">%fa:pencil-alt%</button>
+		</div>
+
+		<div class="nav" v-if="$store.getters.isSignedIn">
+			<div class="home" :class="{ active: $route.name == 'index' }" @click="goToTop">
+				<router-link to="/">%fa:home%</router-link>
+			</div>
+			<div class="deck" :class="{ active: $route.name == 'deck' }" @click="goToTop">
+				<router-link to="/deck">%fa:columns%</router-link>
+			</div>
+			<div class="messaging">
+				<a @click="messaging">%fa:comments%<template v-if="hasUnreadMessagingMessage">%fa:circle%</template></a>
+			</div>
+			<div class="game">
+				<a @click="game">%fa:gamepad%<template v-if="hasGameInvitations">%fa:circle%</template></a>
+			</div>
+		</div>
+
+		<div class="nav bottom" v-if="$store.getters.isSignedIn">
+			<div>
+				<a @click="drive">%fa:cloud%</a>
+			</div>
+			<div ref="notificationsButton" :class="{ active: showNotifications }">
+				<a @click="notifications">%fa:R bell%</a>
+			</div>
+			<div>
+				<a @click="settings">%fa:cog%</a>
+			</div>
+		</div>
+
+		<div class="account">
+			<router-link :to="`/@${ $store.state.i.username }`">
+				<mk-avatar class="avatar" :user="$store.state.i"/>
+			</router-link>
+
+			<div class="nav menu">
+				<div class="signout">
+					<a @click="signout">%fa:power-off%</a>
+				</div>
+				<div>
+					<router-link to="/i/favorites">%fa:star%</router-link>
+				</div>
+				<div v-if="($store.state.i.isLocked || $store.state.i.carefulBot)">
+					<a @click="followRequests">%fa:envelope R%<i v-if="$store.state.i.pendingReceivedFollowRequestsCount">{{ $store.state.i.pendingReceivedFollowRequestsCount }}</i></a>
+				</div>
+			</div>
+		</div>
+
+		<div class="nav dark">
+			<div>
+				<a @click="dark"><template v-if="$store.state.device.darkmode">%fa:moon%</template><template v-else>%fa:R moon%</template></a>
+			</div>
+		</div>
+	</div>
+
+	<transition :name="`slide-${navbar}`">
+		<div class="notifications" v-if="showNotifications" ref="notifications" :class="navbar">
+			<mk-notifications/>
+		</div>
+	</transition>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import MkUserListsWindow from './user-lists-window.vue';
+import MkFollowRequestsWindow from './received-follow-requests-window.vue';
+import MkSettingsWindow from './settings-window.vue';
+import MkDriveWindow from './drive-window.vue';
+import MkMessagingWindow from './messaging-window.vue';
+import MkGameWindow from './game-window.vue';
+import contains from '../../../common/scripts/contains';
+
+export default Vue.extend({
+	data() {
+		return {
+			hasGameInvitations: false,
+			connection: null,
+			showNotifications: false
+		};
+	},
+
+	computed: {
+		hasUnreadMessagingMessage(): boolean {
+			return this.$store.getters.isSignedIn && this.$store.state.i.hasUnreadMessagingMessage;
+		},
+
+		navbar(): string {
+			return this.$store.state.device.navbar;
+		},
+	},
+
+	mounted() {
+		if (this.$store.getters.isSignedIn) {
+			this.connection = (this as any).os.stream.useSharedConnection('main');
+
+			this.connection.on('reversiInvited', this.onReversiInvited);
+			this.connection.on('reversi_no_invites', this.onReversiNoInvites);
+		}
+	},
+
+	beforeDestroy() {
+		if (this.$store.getters.isSignedIn) {
+			this.connection.dispose();
+		}
+	},
+
+	methods: {
+		onReversiInvited() {
+			this.hasGameInvitations = true;
+		},
+
+		onReversiNoInvites() {
+			this.hasGameInvitations = false;
+		},
+
+		messaging() {
+			(this as any).os.new(MkMessagingWindow);
+		},
+
+		game() {
+			(this as any).os.new(MkGameWindow);
+		},
+
+		post() {
+			(this as any).apis.post();
+		},
+
+		drive() {
+			(this as any).os.new(MkDriveWindow);
+		},
+
+		list() {
+			const w = (this as any).os.new(MkUserListsWindow);
+			w.$once('choosen', list => {
+				this.$router.push(`i/lists/${ list.id }`);
+			});
+		},
+
+		followRequests() {
+			(this as any).os.new(MkFollowRequestsWindow);
+		},
+
+		settings() {
+			(this as any).os.new(MkSettingsWindow);
+		},
+
+		signout() {
+			(this as any).os.signout();
+		},
+
+		notifications() {
+			this.showNotifications ? this.closeNotifications() : this.openNotifications();
+		},
+
+		openNotifications() {
+			this.showNotifications = true;
+			Array.from(document.querySelectorAll('body *')).forEach(el => {
+				el.addEventListener('mousedown', this.onMousedown);
+			});
+		},
+
+		closeNotifications() {
+			this.showNotifications = false;
+			Array.from(document.querySelectorAll('body *')).forEach(el => {
+				el.removeEventListener('mousedown', this.onMousedown);
+			});
+		},
+
+		onMousedown(e) {
+			e.preventDefault();
+			if (
+				!contains(this.$refs.notifications, e.target) &&
+				this.$refs.notifications != e.target &&
+				!contains(this.$refs.notificationsButton, e.target) &&
+				this.$refs.notificationsButton != e.target
+			) {
+				this.closeNotifications();
+			}
+			return false;
+		},
+
+		dark() {
+			this.$store.commit('device/set', {
+				key: 'darkmode',
+				value: !this.$store.state.device.darkmode
+			});
+		},
+
+		goToTop() {
+			window.scrollTo({
+				top: 0,
+				behavior: 'smooth'
+			});
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.header
+	$width = 68px
+
+	position fixed
+	top 0
+	z-index 1000
+	width $width
+	height 100%
+
+	&.left
+		left 0
+		box-shadow var(--shadowRight)
+
+	&.right
+		right 0
+		box-shadow var(--shadowLeft)
+
+	> .body
+		position fixed
+		top 0
+		z-index 1
+		width $width
+		height 100%
+		background var(--desktopHeaderBg)
+
+		> .post
+			width $width
+			height $width
+			padding 12px
+
+			> button
+				display inline-block
+				margin 0
+				padding 0
+				height 100%
+				width 100%
+				font-size 1.2em
+				font-weight normal
+				text-decoration none
+				color var(--primaryForeground)
+				background var(--primary) !important
+				outline none
+				border none
+				border-radius 100%
+				transition background 0.1s ease
+				cursor pointer
+
+				*
+					pointer-events none
+
+				&:hover
+					background var(--primaryLighten10) !important
+
+				&:active
+					background var(--primaryDarken10) !important
+					transition background 0s ease
+
+		> .nav.bottom
+			position absolute
+			bottom 128px
+			left 0
+
+		> .account
+			position absolute
+			bottom 64px
+			left 0
+			width $width
+			height $width
+			padding 14px
+
+			> .menu
+				display none
+				position absolute
+				bottom 64px
+				left 0
+				background var(--desktopHeaderBg)
+
+			&:hover
+				> .menu
+					display block
+
+			> *:not(.menu)
+				display block
+				width 100%
+				height 100%
+
+				> .avatar
+					pointer-events none
+					width 100%
+					height 100%
+
+		> .dark
+			position absolute
+			bottom 0
+			left 0
+			width $width
+			height $width
+
+	> .notifications
+		position fixed
+		top 0
+		width 350px
+		height 100%
+		overflow auto
+		background var(--face)
+
+		&.left
+			left $width
+			box-shadow var(--shadowRight)
+
+		&.right
+			right $width
+			box-shadow var(--shadowLeft)
+
+	.nav
+		> *
+			> *
+				display block
+				width $width
+				line-height 52px
+				text-align center
+				font-size 18px
+				color var(--desktopHeaderFg)
+
+				&:hover
+					background rgba(0, 0, 0, 0.05)
+					color var(--desktopHeaderHoverFg)
+					text-decoration none
+
+				&:active
+					background rgba(0, 0, 0, 0.1)
+
+	&.left
+		.nav
+			> *
+				&.active
+					box-shadow -4px 0 var(--primary) inset
+
+	&.right
+		.nav
+			> *
+				&.active
+					box-shadow 4px 0 var(--primary) inset
+
+.slide-left-enter-active,
+.slide-left-leave-active {
+	transition: all 0.2s ease;
+}
+
+.slide-left-enter, .slide-left-leave-to {
+	transform: translateX(-16px);
+	opacity: 0;
+}
+
+.slide-right-enter-active,
+.slide-right-leave-active {
+	transition: all 0.2s ease;
+}
+
+.slide-right-enter, .slide-right-leave-to {
+	transform: translateX(16px);
+	opacity: 0;
+}
+</style>
--- a/src/client/app/desktop/views/components/ui.vue
+++ b/src/client/app/desktop/views/components/ui.vue
@ -1,8 +1,9 @@
 <template>
 <div class="mk-ui" v-hotkey.global="keymap">
 	<div class="bg" v-if="$store.getters.isSignedIn && $store.state.i.wallpaperUrl" :style="style"></div>
-	<x-header class="header" v-show="!zenMode" ref="header"/>
-	<div class="content">
+	<x-header class="header" v-if="navbar == 'top'" v-show="!zenMode" ref="header"/>
+	<x-sidebar class="sidebar" v-if="navbar != 'top'" ref="sidebar"/>
+	<div class="content" :class="[{ sidebar: navbar != 'top' }, navbar]">
 		<slot></slot>
 	</div>
 	<mk-stream-indicator v-if="$store.getters.isSignedIn"/>
@ -12,10 +13,12 @@
 <script lang="ts">
 import Vue from 'vue';
 import XHeader from './ui.header.vue';
+import XSidebar from './ui.sidebar.vue';

 export default Vue.extend({
 	components: {
-		XHeader
+		XHeader,
+		XSidebar
 	},

 	data() {
@ -25,6 +28,10 @@ export default Vue.extend({
 	},

 	computed: {
+		navbar(): string {
+			return this.$store.state.device.navbar;
+		},
+
 		style(): any {
 			if (!this.$store.getters.isSignedIn || this.$store.state.i.wallpaperUrl == null) return {};
 			return {
@ -45,6 +52,12 @@ export default Vue.extend({
 	watch: {
 		'$store.state.uiHeaderHeight'() {
 			this.$el.style.paddingTop = this.$store.state.uiHeaderHeight + 'px';
+		},
+
+		navbar() {
+			if (this.navbar != 'top') {
+				this.$store.commit('setUiHeaderHeight', 0);
+			}
 		}
 	},

@ -83,8 +96,10 @@ export default Vue.extend({
 		background-attachment fixed
 		opacity 0.3

-	> .header
-		@media (max-width 1000px)
-			display none
+	> .content.sidebar.left
+		padding-left 68px
+
+	> .content.sidebar.right
+		padding-right 68px

 </style>
--- a/src/client/app/desktop/views/pages/deck/deck.column.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.column.vue
@ -276,13 +276,24 @@ export default Vue.extend({
 	min-width 330px
 	height 100%
 	background var(--face)
-	border-radius 6px
-	//box-shadow 0 2px 16px rgba(#000, 0.1)
+	border-radius var(--round)
+	box-shadow var(--shadow)
 	overflow hidden

 	&.draghover
 		box-shadow 0 0 0 2px var(--primaryAlpha08)

+		&:after
+			content ""
+			display block
+			position absolute
+			z-index 1000
+			top 0
+			left 0
+			width 100%
+			height 100%
+			background var(--primaryAlpha02)
+
 	&.dragging
 		box-shadow 0 0 0 2px var(--primaryAlpha04)

@ -338,6 +349,7 @@ export default Vue.extend({

 		> .toggleActive
 		> .menu
+			padding 0
 			width $header-height
 			line-height $header-height
 			font-size 16px
--- a/src/client/app/desktop/views/pages/deck/deck.notes.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.notes.vue
@ -2,6 +2,12 @@
 <div class="eamppglmnmimdhrlzhplwpvyeaqmmhxu">
 	<slot name="empty" v-if="notes.length == 0 && !fetching && requestInitPromise == null"></slot>

+	<div class="placeholder" v-if="fetching">
+		<template v-for="i in 10">
+			<mk-note-skeleton :key="i"/>
+		</template>
+	</div>
+
 	<div v-if="!fetching && requestInitPromise != null">
 		<p>%i18n:@error%</p>
 		<button @click="resolveInitPromise">%i18n:@retry%</button>
@ -205,6 +211,10 @@ export default Vue.extend({
 		> *
 			transition transform .3s ease, opacity .3s ease

+	> .placeholder
+		padding 16px
+		opacity 0.3
+
 	> .notes
 		> .date
 			display block
--- a/src/client/app/desktop/views/pages/deck/deck.notifications.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.notifications.vue
@ -1,5 +1,11 @@
 <template>
 <div class="oxynyeqmfvracxnglgulyqfgqxnxmehl">
+	<div class="placeholder" v-if="fetching">
+		<template v-for="i in 10">
+			<mk-note-skeleton :key="i"/>
+		</template>
+	</div>
+
 	<!-- トランジションを有効にするとなぜかメモリリークする -->
 	<component :is="!$store.state.device.reduceMotion ? 'transition-group' : 'div'" name="mk-notifications" class="transition notifications">
 		<template v-for="(notification, i) in _notifications">
@ -14,7 +20,6 @@
 		<template v-if="fetchingMoreNotifications">%fa:spinner .pulse .fw%</template>{{ fetchingMoreNotifications ? '%i18n:common.loading%' : '%i18n:@more%' }}
 	</button>
 	<p class="empty" v-if="notifications.length == 0 && !fetching">%i18n:@empty%</p>
-	<p class="loading" v-if="fetching">%fa:spinner .pulse .fw%%i18n:common.loading%<mk-ellipsis/></p>
 </div>
 </template>

@ -161,6 +166,10 @@ export default Vue.extend({
 		> *
 			transition transform .3s ease, opacity .3s ease

+	> .placeholder
+		padding 16px
+		opacity 0.3
+
 	> .notifications

 		> .notification:not(:last-child)
@ -207,13 +216,4 @@ export default Vue.extend({
 		text-align center
 		color #aaa

-	> .loading
-		margin 0
-		padding 16px
-		text-align center
-		color #aaa
-
-		> [data-fa]
-			margin-right 4px
-
 </style>
--- a/src/client/app/desktop/views/pages/search.vue
+++ b/src/client/app/desktop/views/pages/search.vue
@ -3,9 +3,6 @@
 	<header :class="$style.header">
 		<h1>{{ q }}</h1>
 	</header>
-	<div :class="$style.loading" v-if="fetching">
-		<mk-ellipsis-icon/>
-	</div>
 	<p :class="$style.notAvailable" v-if="!fetching && notAvailable">%i18n:@not-available%</p>
 	<p :class="$style.empty" v-if="!fetching && empty">%fa:search% {{ '%i18n:not-found%'.split('{}')[0] }}{{ q }}{{ '%i18n:not-found%'.split('{}')[1] }}</p>
 	<mk-notes ref="timeline" :class="$style.notes" :more="existMore ? more : null"/>
@ -119,9 +116,6 @@ export default Vue.extend({
 	border-radius 6px
 	overflow hidden

-.loading
-	padding 64px 0
-
 .empty
 	display block
 	margin 0 auto
--- a/src/client/app/desktop/views/pages/tag.vue
+++ b/src/client/app/desktop/views/pages/tag.vue
@ -3,9 +3,6 @@
 	<header :class="$style.header">
 		<h1>#{{ $route.params.tag }}</h1>
 	</header>
-	<div :class="$style.loading" v-if="fetching">
-		<mk-ellipsis-icon/>
-	</div>
 	<p :class="$style.empty" v-if="!fetching && empty">%fa:search% {{ '%i18n:no-posts-found%'.split('{}')[0] }}{{ q }}{{ '%i18n:no-posts-found%'.split('{}')[1] }}</p>
 	<mk-notes ref="timeline" :class="$style.notes" :more="existMore ? more : null"/>
 </mk-ui>
@ -108,9 +105,6 @@ export default Vue.extend({
 	border-radius 6px
 	overflow hidden

-.loading
-	padding 64px 0
-
 .empty
 	display block
 	margin 0 auto
--- a/src/client/app/desktop/views/pages/user/user.timeline.vue
+++ b/src/client/app/desktop/views/pages/user/user.timeline.vue
@ -5,9 +5,6 @@
 		<span :data-active="mode == 'with-replies'" @click="mode = 'with-replies'">%fa:comments% %i18n:@with-replies%</span>
 		<span :data-active="mode == 'with-media'" @click="mode = 'with-media'">%fa:images% %i18n:@with-media%</span>
 	</header>
-	<div class="loading" v-if="fetching">
-		<mk-ellipsis-icon/>
-	</div>
 	<mk-notes ref="timeline" :more="existMore ? more : null">
 		<p class="empty" slot="empty">%fa:R comments%%i18n:@empty%</p>
 	</mk-notes>
@ -152,9 +149,6 @@ export default Vue.extend({
 				&:hover
 					color var(--desktopTimelineSrcHover)

-	> .loading
-		padding 64px 0
-
 	> .empty
 		display block
 		margin 0 auto
--- a/src/client/app/init.ts
+++ b/src/client/app/init.ts
@ -124,11 +124,17 @@ export default (callback: (launch: (router: VueRouter, api?: (os: MiOS) => API)

 			//#region shadow
 			const shadow = '0 3px 8px rgba(0, 0, 0, 0.2)';
+			const shadowRight = '4px 0 4px rgba(0, 0, 0, 0.1)';
+			const shadowLeft = '-4px 0 4px rgba(0, 0, 0, 0.1)';
 			if (os.store.state.settings.useShadow) document.documentElement.style.setProperty('--shadow', shadow);
+			if (os.store.state.settings.useShadow) document.documentElement.style.setProperty('--shadowRight', shadowRight);
+			if (os.store.state.settings.useShadow) document.documentElement.style.setProperty('--shadowLeft', shadowLeft);
 			os.store.watch(s => {
 				return s.settings.useShadow;
 			}, v => {
 				document.documentElement.style.setProperty('--shadow', v ? shadow : 'none');
+				document.documentElement.style.setProperty('--shadowRight', v ? shadowRight : 'none');
+				document.documentElement.style.setProperty('--shadowLeft', v ? shadowLeft : 'none');
 			});
 			//#endregion

--- a/src/client/app/mios.ts
+++ b/src/client/app/mios.ts
@ -443,7 +443,7 @@ export default class MiOS extends EventEmitter {
 		};

 		const promise = new Promise((resolve, reject) => {
-			const viaStream = this.stream && this.store.state.device.apiViaStream && !forceFetch;
+			const viaStream = this.stream && this.stream.state == 'connected' && this.store.state.device.apiViaStream && !forceFetch;

 			if (viaStream) {
 				const id = Math.random().toString().substr(2, 8);
--- a/src/client/app/mobile/views/components/drive.file-detail.vue
+++ b/src/client/app/mobile/views/components/drive.file-detail.vue
@ -41,6 +41,8 @@
 			<ui-button link :href="`${file.url}?download`" :download="file.name">%fa:download% %i18n:@download%</ui-button>
 			<ui-button @click="rename">%fa:pencil-alt% %i18n:@rename%</ui-button>
 			<ui-button @click="move">%fa:R folder-open% %i18n:@move%</ui-button>
+			<ui-button @click="toggleSensitive" v-if="file.isSensitive">%fa:R eye% %i18n:@unmark-as-sensitive%</ui-button>
+			<ui-button @click="toggleSensitive" v-else>%fa:R eye-slash% %i18n:@mark-as-sensitive%</ui-button>
 			<ui-button @click="del">%fa:trash-alt R% %i18n:@delete%</ui-button>
 		</div>
 	</div>
@ -71,25 +73,30 @@ import { gcd } from '../../../../../prelude/math';

 export default Vue.extend({
 	props: ['file'],
+
 	data() {
 		return {
 			gcd,
 			exif: null
 		};
 	},
+
 	computed: {
 		browser(): any {
 			return this.$parent;
 		},
+
 		kind(): string {
 			return this.file.type.split('/')[0];
 		},
+
 		style(): any {
 			return this.file.properties.avgColor && this.file.properties.avgColor.length == 3 ? {
 				'background-color': `rgb(${ this.file.properties.avgColor.join(',') })`
 			} : {};
 		}
 	},
+
 	methods: {
 		rename() {
 			const name = window.prompt('%i18n:@rename%', this.file.name);
@ -101,6 +108,7 @@ export default Vue.extend({
 				this.browser.cf(this.file, true);
 			});
 		},
+
 		move() {
 			(this as any).apis.chooseDriveFolder().then(folder => {
 				(this as any).api('drive/files/update', {
@ -111,6 +119,7 @@ export default Vue.extend({
 				});
 			});
 		},
+
 		del() {
 			(this as any).api('drive/files/delete', {
 				fileId: this.file.id
@ -118,9 +127,20 @@ export default Vue.extend({
 				this.browser.cd(this.file.folderId, true);
 			});
 		},
+
+		toggleSensitive() {
+			(this as any).api('drive/files/update', {
+				fileId: this.file.id,
+				isSensitive: !this.file.isSensitive
+			});
+
+			this.file.isSensitive = !this.file.isSensitive;
+		},
+
 		showCreatedAt() {
 			alert(new Date(this.file.createdAt).toLocaleString());
 		},
+
 		onImageLoaded() {
 			const self = this;
 			EXIF.getData(this.$refs.img, function(this: any) {
--- a/src/client/app/mobile/views/components/notes.vue
+++ b/src/client/app/mobile/views/components/notes.vue
@ -4,8 +4,10 @@

 	<slot name="empty" v-if="notes.length == 0 && !fetching && requestInitPromise == null"></slot>

-	<div class="init" v-if="fetching">
-		%fa:spinner .pulse%%i18n:common.loading%
+	<div class="placeholder" v-if="fetching">
+		<template v-for="i in 10">
+			<mk-note-skeleton :key="i"/>
+		</template>
 	</div>

 	<div v-if="!fetching && requestInitPromise != null">
@ -251,13 +253,12 @@ export default Vue.extend({
 			[data-fa]
 				margin-right 8px

-	> .init
-		padding 64px 0
-		text-align center
-		color #999
+	> .placeholder
+		padding 16px
+		opacity 0.3

-		> [data-fa]
-			margin-right 4px
+		@media (min-width 500px)
+			padding 32px

 	> .empty
 		margin 0 auto
--- a/src/client/app/mobile/views/components/notifications.vue
+++ b/src/client/app/mobile/views/components/notifications.vue
@ -1,5 +1,11 @@
 <template>
 <div class="mk-notifications">
+	<div class="placeholder" v-if="fetching">
+		<template v-for="i in 10">
+			<mk-note-skeleton :key="i"/>
+		</template>
+	</div>
+
 	<!-- トランジションを有効にするとなぜかメモリリークする -->
 	<component :is="!$store.state.device.reduceMotion ? 'transition-group' : 'div'" name="mk-notifications" class="transition notifications">
 		<template v-for="(notification, i) in _notifications">
@ -17,7 +23,6 @@
 	</button>

 	<p class="empty" v-if="notifications.length == 0 && !fetching">%i18n:@empty%</p>
-	<p class="fetching" v-if="fetching">%fa:spinner .pulse .fw%%i18n:common.loading%<mk-ellipsis/></p>
 </div>
 </template>

@ -179,13 +184,11 @@ export default Vue.extend({
 		text-align center
 		color #aaa

-	> .fetching
-		margin 0
+	> .placeholder
 		padding 16px
-		text-align center
-		color #aaa
+		opacity 0.3

-		> [data-fa]
-			margin-right 4px
+		@media (min-width 500px)
+			padding 32px

 </style>
--- a/src/client/app/mobile/views/components/post-form.vue
+++ b/src/client/app/mobile/views/components/post-form.vue
@ -62,6 +62,7 @@ import { host } from '../../../config';
 import { erase, unique } from '../../../../../prelude/array';
 import { length } from 'stringz';
 import parseAcct from '../../../../../misc/acct/parse';
+import { toASCII } from 'punycode';

 export default Vue.extend({
 	components: {
@ -153,14 +154,14 @@ export default Vue.extend({
 		}

 		if (this.reply && this.reply.user.host != null) {
-			this.text = `@${this.reply.user.username}@${this.reply.user.host} `;
+			this.text = `@${this.reply.user.username}@${toASCII(this.reply.user.host)} `;
 		}

 		if (this.reply && this.reply.text != null) {
 			const ast = parse(this.reply.text);

 			ast.filter(t => t.type == 'mention').forEach(x => {
-				const mention = x.host ? `@${x.username}@${x.host}` : `@${x.username}`;
+				const mention = x.host ? `@${x.username}@${toASCII(x.host)}` : `@${x.username}`;

 				// 自分は除外
 				if (this.$store.state.i.username == x.username && x.host == null) return;
--- a/src/client/app/store.ts
+++ b/src/client/app/store.ts
@ -56,6 +56,7 @@ const defaultDeviceSettings = {
 	loadRawImages: false,
 	alwaysShowNsfw: false,
 	postStyle: 'standard',
+	navbar: 'top',
 	mobileNotificationPosition: 'bottom'
 };

--- a/src/mfm/parse/elements/mention.ts
+++ b/src/mfm/parse/elements/mention.ts
@ -2,10 +2,12 @@
 * Mention
 */
 import parseAcct from '../../../misc/acct/parse';
+import { toUnicode } from 'punycode';

 export type TextElementMention = {
 	type: 'mention'
 	content: string
+	canonical: string
 	username: string
 	host: string
 };
@ -15,9 +17,11 @@ export default function(text: string) {
 	if (!match) return null;
 	const mention = match[0];
 	const { username, host } = parseAcct(mention.substr(1));
+	const canonical = host != null ? `@${username}@${toUnicode(host)}` : mention;
 	return {
 		type: 'mention',
 		content: mention,
+		canonical,
 		username,
 		host
 	} as TextElementMention;
--- a/src/misc/cafy-id.ts
+++ b/src/misc/cafy-id.ts
@ -1,5 +1,6 @@
 import * as mongo from 'mongodb';
 import { Context } from 'cafy';
+import isObjectId from './is-objectid';

 export const isAnId = (x: any) => mongo.ObjectID.isValid(x);
 export const isNotAnId = (x: any) => !isAnId(x);
@ -12,7 +13,7 @@ export default class ID extends Context<mongo.ObjectID> {
 		super();

 		this.transform = v => {
-			if (isAnId(v) && !mongo.ObjectID.prototype.isPrototypeOf(v)) {
+			if (isAnId(v) && !isObjectId(v)) {
 				return new mongo.ObjectID(v);
 			} else {
 				return v;
@ -20,7 +21,7 @@ export default class ID extends Context<mongo.ObjectID> {
 		};

 		this.push(v => {
-			if (!mongo.ObjectID.prototype.isPrototypeOf(v) && isNotAnId(v)) {
+			if (!isObjectId(v) && isNotAnId(v)) {
 				return new Error('must-be-an-id');
 			}
 			return true;
--- a/src/misc/is-objectid.ts
+++ b/src/misc/is-objectid.ts
@ -0,0 +1,3 @@
+export default function(x: any): boolean {
+	return x.hasOwnProperty('toHexString') || x.hasOwnProperty('_bsontype');
+}
--- a/src/misc/should-mute-this-note.ts
+++ b/src/misc/should-mute-this-note.ts
@ -1,7 +1,8 @@
 import * as mongo from 'mongodb';
+import isObjectId from './is-objectid';

 function toString(id: any) {
-	return mongo.ObjectID.prototype.isPrototypeOf(id) ? (id as mongo.ObjectID).toHexString() : id;
+	return isObjectId(id) ? (id as mongo.ObjectID).toHexString() : id;
 }

 export default function(note: any, mutedUserIds: string[]): boolean {
--- a/src/models/access-token.ts
+++ b/src/models/access-token.ts
@ -1,5 +1,6 @@
 import * as mongo from 'mongodb';
 import db from '../db/mongodb';
+import isObjectId from '../misc/is-objectid';

 const AccessToken = db.get<IAccessToken>('accessTokens');
 AccessToken.createIndex('token');
@ -22,7 +23,7 @@ export async function deleteAccessToken(accessToken: string | mongo.ObjectID | I
 	let a: IAccessToken;

 	// Populate
-	if (mongo.ObjectID.prototype.isPrototypeOf(accessToken)) {
+	if (isObjectId(accessToken)) {
 		a = await AccessToken.findOne({
 			_id: accessToken
 		});
--- a/src/models/app.ts
+++ b/src/models/app.ts
@ -2,6 +2,7 @@ import * as mongo from 'mongodb';
 const deepcopy = require('deepcopy');
 import AccessToken from './access-token';
 import db from '../db/mongodb';
+import isObjectId from '../misc/is-objectid';
 import config from '../config';

 const App = db.get<IApp>('apps');
@ -43,7 +44,7 @@ export const pack = (
 	let _app: any;

 	// Populate the app if 'app' is ID
-	if (mongo.ObjectID.prototype.isPrototypeOf(app)) {
+	if (isObjectId(app)) {
 		_app = await App.findOne({
 			_id: app
 		});
@ -56,7 +57,7 @@ export const pack = (
 	}

 	// Me
-	if (me && !mongo.ObjectID.prototype.isPrototypeOf(me)) {
+	if (me && !isObjectId(me)) {
 		if (typeof me === 'string') {
 			me = new mongo.ObjectID(me);
 		} else {
--- a/src/models/auth-session.ts
+++ b/src/models/auth-session.ts
@ -1,6 +1,7 @@
 import * as mongo from 'mongodb';
 const deepcopy = require('deepcopy');
 import db from '../db/mongodb';
+import isObjectId from '../misc/is-objectid';
 import { pack as packApp } from './app';

 const AuthSession = db.get<IAuthSession>('authSessions');
@ -31,7 +32,7 @@ export const pack = (
 	_session = deepcopy(session);

 	// Me
-	if (me && !mongo.ObjectID.prototype.isPrototypeOf(me)) {
+	if (me && !isObjectId(me)) {
 		if (typeof me === 'string') {
 			me = new mongo.ObjectID(me);
 		} else {
--- a/src/models/drive-file-thumbnail.ts
+++ b/src/models/drive-file-thumbnail.ts
@ -1,5 +1,6 @@
 import * as mongo from 'mongodb';
 import monkDb, { nativeDbConn } from '../db/mongodb';
+import isObjectId from '../misc/is-objectid';

 const DriveFileThumbnail = monkDb.get<IDriveFileThumbnail>('driveFileThumbnails.files');
 DriveFileThumbnail.createIndex('metadata.originalId', { sparse: true, unique: true });
@ -35,7 +36,7 @@ export async function deleteDriveFileThumbnail(driveFile: string | mongo.ObjectI
 	let d: IDriveFileThumbnail;

 	// Populate
-	if (mongo.ObjectID.prototype.isPrototypeOf(driveFile)) {
+	if (isObjectId(driveFile)) {
 		d = await DriveFileThumbnail.findOne({
 			_id: driveFile
 		});
--- a/src/models/drive-file.ts
+++ b/src/models/drive-file.ts
@ -3,6 +3,7 @@ const deepcopy = require('deepcopy');
 import { pack as packFolder } from './drive-folder';
 import config from '../config';
 import monkDb, { nativeDbConn } from '../db/mongodb';
+import isObjectId from '../misc/is-objectid';
 import Note, { deleteNote } from './note';
 import MessagingMessage, { deleteMessagingMessage } from './messaging-message';
 import User from './user';
@ -78,7 +79,7 @@ export async function deleteDriveFile(driveFile: string | mongo.ObjectID | IDriv
 	let d: IDriveFile;

 	// Populate
-	if (mongo.ObjectID.prototype.isPrototypeOf(driveFile)) {
+	if (isObjectId(driveFile)) {
 		d = await DriveFile.findOne({
 			_id: driveFile
 		});
@ -154,7 +155,7 @@ export const pack = (
 	let _file: any;

 	// Populate the file if 'file' is ID
-	if (mongo.ObjectID.prototype.isPrototypeOf(file)) {
+	if (isObjectId(file)) {
 		_file = await DriveFile.findOne({
 			_id: file
 		});
--- a/src/models/drive-folder.ts
+++ b/src/models/drive-folder.ts
@ -1,6 +1,7 @@
 import * as mongo from 'mongodb';
 const deepcopy = require('deepcopy');
 import db from '../db/mongodb';
+import isObjectId from '../misc/is-objectid';
 import DriveFile from './drive-file';

 const DriveFolder = db.get<IDriveFolder>('driveFolders');
@ -29,7 +30,7 @@ export async function deleteDriveFolder(driveFolder: string | mongo.ObjectID | I
 	let d: IDriveFolder;

 	// Populate
-	if (mongo.ObjectID.prototype.isPrototypeOf(driveFolder)) {
+	if (isObjectId(driveFolder)) {
 		d = await DriveFolder.findOne({
 			_id: driveFolder
 		});
@ -83,7 +84,7 @@ export const pack = (
 	let _folder: any;

 	// Populate the folder if 'folder' is ID
-	if (mongo.ObjectID.prototype.isPrototypeOf(folder)) {
+	if (isObjectId(folder)) {
 		_folder = await DriveFolder.findOne({ _id: folder });
 	} else if (typeof folder === 'string') {
 		_folder = await DriveFolder.findOne({ _id: new mongo.ObjectID(folder) });
--- a/src/models/favorite.ts
+++ b/src/models/favorite.ts
@ -1,6 +1,7 @@
 import * as mongo from 'mongodb';
 const deepcopy = require('deepcopy');
 import db from '../db/mongodb';
+import isObjectId from '../misc/is-objectid';
 import { pack as packNote } from './note';

 const Favorite = db.get<IFavorite>('favorites');
@ -21,7 +22,7 @@ export async function deleteFavorite(favorite: string | mongo.ObjectID | IFavori
 	let f: IFavorite;

 	// Populate
-	if (mongo.ObjectID.prototype.isPrototypeOf(favorite)) {
+	if (isObjectId(favorite)) {
 		f = await Favorite.findOne({
 			_id: favorite
 		});
@ -58,7 +59,7 @@ export const pack = (
 	let _favorite: any;

 	// Populate the favorite if 'favorite' is ID
-	if (mongo.ObjectID.prototype.isPrototypeOf(favorite)) {
+	if (isObjectId(favorite)) {
 		_favorite = await Favorite.findOne({
 			_id: favorite
 		});
--- a/src/models/follow-request.ts
+++ b/src/models/follow-request.ts
@ -1,6 +1,7 @@
 import * as mongo from 'mongodb';
 const deepcopy = require('deepcopy');
 import db from '../db/mongodb';
+import isObjectId from '../misc/is-objectid';
 import { pack as packUser } from './user';

 const FollowRequest = db.get<IFollowRequest>('followRequests');
@ -12,6 +13,7 @@ export type IFollowRequest = {
 	createdAt: Date;
 	followeeId: mongo.ObjectID;
 	followerId: mongo.ObjectID;
+	requestId?: string;	// id of Follow Activity

 	// 非正規化
 	_followee: {
@ -33,7 +35,7 @@ export async function deleteFollowRequest(followRequest: string | mongo.ObjectID
 	let f: IFollowRequest;

 	// Populate
-	if (mongo.ObjectID.prototype.isPrototypeOf(followRequest)) {
+	if (isObjectId(followRequest)) {
 		f = await FollowRequest.findOne({
 			_id: followRequest
 		});
@ -63,7 +65,7 @@ export const pack = (
 	let _request: any;

 	// Populate the request if 'request' is ID
-	if (mongo.ObjectID.prototype.isPrototypeOf(request)) {
+	if (isObjectId(request)) {
 		_request = await FollowRequest.findOne({
 			_id: request
 		});
--- a/src/models/followed-log.ts
+++ b/src/models/followed-log.ts
@ -1,5 +1,6 @@
 import * as mongo from 'mongodb';
 import db from '../db/mongodb';
+import isObjectId from '../misc/is-objectid';

 const FollowedLog = db.get<IFollowedLog>('followedLogs');
 export default FollowedLog;
@ -18,7 +19,7 @@ export async function deleteFollowedLog(followedLog: string | mongo.ObjectID | I
 	let f: IFollowedLog;

 	// Populate
-	if (mongo.ObjectID.prototype.isPrototypeOf(followedLog)) {
+	if (isObjectId(followedLog)) {
 		f = await FollowedLog.findOne({
 			_id: followedLog
 		});
--- a/src/models/following-log.ts
+++ b/src/models/following-log.ts
@ -1,5 +1,6 @@
 import * as mongo from 'mongodb';
 import db from '../db/mongodb';
+import isObjectId from '../misc/is-objectid';

 const FollowingLog = db.get<IFollowingLog>('followingLogs');
 export default FollowingLog;
@ -18,7 +19,7 @@ export async function deleteFollowingLog(followingLog: string | mongo.ObjectID |
 	let f: IFollowingLog;

 	// Populate
-	if (mongo.ObjectID.prototype.isPrototypeOf(followingLog)) {
+	if (isObjectId(followingLog)) {
 		f = await FollowingLog.findOne({
 			_id: followingLog
 		});
--- a/src/models/following.ts
+++ b/src/models/following.ts
@ -1,5 +1,6 @@
 import * as mongo from 'mongodb';
 import db from '../db/mongodb';
+import isObjectId from '../misc/is-objectid';

 const Following = db.get<IFollowing>('following');
 Following.createIndex(['followerId', 'followeeId'], { unique: true });
@ -32,7 +33,7 @@ export async function deleteFollowing(following: string | mongo.ObjectID | IFoll
 	let f: IFollowing;

 	// Populate
-	if (mongo.ObjectID.prototype.isPrototypeOf(following)) {
+	if (isObjectId(following)) {
 		f = await Following.findOne({
 			_id: following
 		});
--- a/src/models/games/reversi/game.ts
+++ b/src/models/games/reversi/game.ts
@ -1,6 +1,7 @@
 import * as mongo from 'mongodb';
 const deepcopy = require('deepcopy');
 import db from '../../../db/mongodb';
+import isObjectId from '../../../misc/is-objectid';
 import { IUser, pack as packUser } from '../../user';

 const ReversiGame = db.get<IReversiGame>('reversiGames');
@ -62,7 +63,7 @@ export const pack = (
 	let _game: any;

 	// Populate the game if 'game' is ID
-	if (mongo.ObjectID.prototype.isPrototypeOf(game)) {
+	if (isObjectId(game)) {
 		_game = await ReversiGame.findOne({
 			_id: game
 		});
@ -76,7 +77,7 @@ export const pack = (

 	// Me
 	const meId: mongo.ObjectID = me
-		? mongo.ObjectID.prototype.isPrototypeOf(me)
+		? isObjectId(me)
 			? me as mongo.ObjectID
 			: typeof me === 'string'
 				? new mongo.ObjectID(me)
--- a/src/models/games/reversi/matching.ts
+++ b/src/models/games/reversi/matching.ts
@ -1,6 +1,7 @@
 import * as mongo from 'mongodb';
 const deepcopy = require('deepcopy');
 import db from '../../../db/mongodb';
+import isObjectId from '../../../misc/is-objectid';
 import { IUser, pack as packUser } from '../../user';

 const Matching = db.get<IMatching>('reversiMatchings');
@ -23,7 +24,7 @@ export const pack = (

 	// Me
 	const meId: mongo.ObjectID = me
-		? mongo.ObjectID.prototype.isPrototypeOf(me)
+		? isObjectId(me)
 			? me as mongo.ObjectID
 			: typeof me === 'string'
 				? new mongo.ObjectID(me)
--- a/src/models/messaging-history.ts
+++ b/src/models/messaging-history.ts
@ -1,5 +1,6 @@
 import * as mongo from 'mongodb';
 import db from '../db/mongodb';
+import isObjectId from '../misc/is-objectid';

 const MessagingHistory = db.get<IMessagingHistory>('messagingHistories');
 export default MessagingHistory;
@ -19,7 +20,7 @@ export async function deleteMessagingHistory(messagingHistory: string | mongo.Ob
 	let m: IMessagingHistory;

 	// Populate
-	if (mongo.ObjectID.prototype.isPrototypeOf(messagingHistory)) {
+	if (isObjectId(messagingHistory)) {
 		m = await MessagingHistory.findOne({
 			_id: messagingHistory
 		});
--- a/src/models/messaging-message.ts
+++ b/src/models/messaging-message.ts
@ -3,6 +3,7 @@ const deepcopy = require('deepcopy');
 import { pack as packUser } from './user';
 import { pack as packFile } from './drive-file';
 import db from '../db/mongodb';
+import isObjectId from '../misc/is-objectid';
 import MessagingHistory, { deleteMessagingHistory } from './messaging-history';
 import { length } from 'stringz';

@ -30,7 +31,7 @@ export async function deleteMessagingMessage(messagingMessage: string | mongo.Ob
 	let m: IMessagingMessage;

 	// Populate
-	if (mongo.ObjectID.prototype.isPrototypeOf(messagingMessage)) {
+	if (isObjectId(messagingMessage)) {
 		m = await MessagingMessage.findOne({
 			_id: messagingMessage
 		});
@ -72,7 +73,7 @@ export const pack = (
 	let _message: any;

 	// Populate the message if 'message' is ID
-	if (mongo.ObjectID.prototype.isPrototypeOf(message)) {
+	if (isObjectId(message)) {
 		_message = await MessagingMessage.findOne({
 			_id: message
 		});
--- a/src/models/mute.ts
+++ b/src/models/mute.ts
@ -1,5 +1,6 @@
 import * as mongo from 'mongodb';
 import db from '../db/mongodb';
+import isObjectId from '../misc/is-objectid';

 const Mute = db.get<IMute>('mute');
 Mute.createIndex(['muterId', 'muteeId'], { unique: true });
@ -19,7 +20,7 @@ export async function deleteMute(mute: string | mongo.ObjectID | IMute) {
 	let m: IMute;

 	// Populate
-	if (mongo.ObjectID.prototype.isPrototypeOf(mute)) {
+	if (isObjectId(mute)) {
 		m = await Mute.findOne({
 			_id: mute
 		});
--- a/src/models/note-reaction.ts
+++ b/src/models/note-reaction.ts
@ -2,6 +2,7 @@ import * as mongo from 'mongodb';
 import $ from 'cafy';
 const deepcopy = require('deepcopy');
 import db from '../db/mongodb';
+import isObjectId from '../misc/is-objectid';
 import Reaction from './note-reaction';
 import { pack as packUser } from './user';

@ -37,7 +38,7 @@ export async function deleteNoteReaction(noteReaction: string | mongo.ObjectID |
 	let n: INoteReaction;

 	// Populate
-	if (mongo.ObjectID.prototype.isPrototypeOf(noteReaction)) {
+	if (isObjectId(noteReaction)) {
 		n = await NoteReaction.findOne({
 			_id: noteReaction
 		});
@ -67,7 +68,7 @@ export const pack = (
 	let _reaction: any;

 	// Populate the reaction if 'reaction' is ID
-	if (mongo.ObjectID.prototype.isPrototypeOf(reaction)) {
+	if (isObjectId(reaction)) {
 		_reaction = await Reaction.findOne({
 			_id: reaction
 		});
--- a/src/models/note-watching.ts
+++ b/src/models/note-watching.ts
@ -1,5 +1,6 @@
 import * as mongo from 'mongodb';
 import db from '../db/mongodb';
+import isObjectId from '../misc/is-objectid';

 const NoteWatching = db.get<INoteWatching>('noteWatching');
 NoteWatching.createIndex(['userId', 'noteId'], { unique: true });
@ -19,7 +20,7 @@ export async function deleteNoteWatching(noteWatching: string | mongo.ObjectID |
 	let n: INoteWatching;

 	// Populate
-	if (mongo.ObjectID.prototype.isPrototypeOf(noteWatching)) {
+	if (isObjectId(noteWatching)) {
 		n = await NoteWatching.findOne({
 			_id: noteWatching
 		});
--- a/src/models/note.ts
+++ b/src/models/note.ts
@ -2,6 +2,7 @@ import * as mongo from 'mongodb';
 const deepcopy = require('deepcopy');
 import rap from '@prezzemolo/rap';
 import db from '../db/mongodb';
+import isObjectId from '../misc/is-objectid';
 import { length } from 'stringz';
 import { IUser, pack as packUser } from './user';
 import { pack as packApp } from './app';
@ -107,7 +108,7 @@ export async function deleteNote(note: string | mongo.ObjectID | INote) {
 	let n: INote;

 	// Populate
-	if (mongo.ObjectID.prototype.isPrototypeOf(note)) {
+	if (isObjectId(note)) {
 		n = await Note.findOne({
 			_id: note
 		});
@ -259,7 +260,7 @@ export const pack = async (

 	// Me
 	const meId: mongo.ObjectID = me
-		? mongo.ObjectID.prototype.isPrototypeOf(me)
+		? isObjectId(me)
 			? me as mongo.ObjectID
 			: typeof me === 'string'
 				? new mongo.ObjectID(me)
@ -269,7 +270,7 @@ export const pack = async (
 	let _note: any;

 	// Populate the note if 'note' is ID
-	if (mongo.ObjectID.prototype.isPrototypeOf(note)) {
+	if (isObjectId(note)) {
 		_note = await Note.findOne({
 			_id: note
 		});
--- a/src/models/notification.ts
+++ b/src/models/notification.ts
@ -1,6 +1,7 @@
 import * as mongo from 'mongodb';
 const deepcopy = require('deepcopy');
 import db from '../db/mongodb';
+import isObjectId from '../misc/is-objectid';
 import { IUser, pack as packUser } from './user';
 import { pack as packNote } from './note';

@ -57,7 +58,7 @@ export async function deleteNotification(notification: string | mongo.ObjectID |
 	let n: INotification;

 	// Populate
-	if (mongo.ObjectID.prototype.isPrototypeOf(notification)) {
+	if (isObjectId(notification)) {
 		n = await Notification.findOne({
 			_id: notification
 		});
@ -90,7 +91,7 @@ export const pack = (notification: any) => new Promise<any>(async (resolve, reje
 	let _notification: any;

 	// Populate the notification if 'notification' is ID
-	if (mongo.ObjectID.prototype.isPrototypeOf(notification)) {
+	if (isObjectId(notification)) {
 		_notification = await Notification.findOne({
 			_id: notification
 		});
--- a/src/models/poll-vote.ts
+++ b/src/models/poll-vote.ts
@ -1,5 +1,6 @@
 import * as mongo from 'mongodb';
 import db from '../db/mongodb';
+import isObjectId from '../misc/is-objectid';

 const PollVote = db.get<IPollVote>('pollVotes');
 export default PollVote;
@ -19,7 +20,7 @@ export async function deletePollVote(pollVote: string | mongo.ObjectID | IPollVo
 	let p: IPollVote;

 	// Populate
-	if (mongo.ObjectID.prototype.isPrototypeOf(pollVote)) {
+	if (isObjectId(pollVote)) {
 		p = await PollVote.findOne({
 			_id: pollVote
 		});
--- a/src/models/sw-subscription.ts
+++ b/src/models/sw-subscription.ts
@ -1,5 +1,6 @@
 import * as mongo from 'mongodb';
 import db from '../db/mongodb';
+import isObjectId from '../misc/is-objectid';

 const SwSubscription = db.get<ISwSubscription>('swSubscriptions');
 export default SwSubscription;
@ -19,7 +20,7 @@ export async function deleteSwSubscription(swSubscription: string | mongo.Object
 	let s: ISwSubscription;

 	// Populate
-	if (mongo.ObjectID.prototype.isPrototypeOf(swSubscription)) {
+	if (isObjectId(swSubscription)) {
 		s = await SwSubscription.findOne({
 			_id: swSubscription
 		});
--- a/src/models/user-list.ts
+++ b/src/models/user-list.ts
@ -1,6 +1,7 @@
 import * as mongo from 'mongodb';
 const deepcopy = require('deepcopy');
 import db from '../db/mongodb';
+import isObjectId from '../misc/is-objectid';

 const UserList = db.get<IUserList>('userList');
 export default UserList;
@ -20,7 +21,7 @@ export async function deleteUserList(userList: string | mongo.ObjectID | IUserLi
 	let u: IUserList;

 	// Populate
-	if (mongo.ObjectID.prototype.isPrototypeOf(userList)) {
+	if (isObjectId(userList)) {
 		u = await UserList.findOne({
 			_id: userList
 		});
@ -45,7 +46,7 @@ export const pack = (
 ) => new Promise<any>(async (resolve, reject) => {
 	let _userList: any;

-	if (mongo.ObjectID.prototype.isPrototypeOf(userList)) {
+	if (isObjectId(userList)) {
 		_userList = await UserList.findOne({
 			_id: userList
 		});
--- a/src/models/user.ts
+++ b/src/models/user.ts
@ -3,6 +3,7 @@ const deepcopy = require('deepcopy');
 const sequential = require('promise-sequential');
 import rap from '@prezzemolo/rap';
 import db from '../db/mongodb';
+import isObjectId from '../misc/is-objectid';
 import Note, { packMany as packNoteMany, deleteNote } from './note';
 import Following, { deleteFollowing } from './following';
 import Mute, { deleteMute } from './mute';
@ -175,7 +176,7 @@ export async function deleteUser(user: string | mongo.ObjectID | IUser) {
 	let u: IUser;

 	// Populate
-	if (mongo.ObjectID.prototype.isPrototypeOf(user)) {
+	if (isObjectId(user)) {
 		u = await User.findOne({
 			_id: user
 		});
@ -340,7 +341,6 @@ export const pack = (
 		includeHasUnreadNotes?: boolean
 	}
 ) => new Promise<any>(async (resolve, reject) => {
-
 	const opts = Object.assign({
 		detail: false,
 		includeSecrets: false
@ -358,7 +358,7 @@ export const pack = (
 	};

 	// Populate the user if 'user' is ID
-	if (mongo.ObjectID.prototype.isPrototypeOf(user)) {
+	if (isObjectId(user)) {
 		_user = await User.findOne({
 			_id: user
 		}, { fields });
@ -378,7 +378,7 @@ export const pack = (

 	// Me
 	const meId: mongo.ObjectID = me
-		? mongo.ObjectID.prototype.isPrototypeOf(me)
+		? isObjectId(me)
 			? me as mongo.ObjectID
 			: typeof me === 'string'
 				? new mongo.ObjectID(me)
--- a/src/remote/activitypub/kernel/follow.ts
+++ b/src/remote/activitypub/kernel/follow.ts
@ -23,5 +23,5 @@ export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
 		throw new Error('フォローしようとしているユーザーはローカルユーザーではありません');
 	}

-	await follow(actor, followee);
+	await follow(actor, followee, activity.id);
 };
--- a/src/remote/activitypub/renderer/accept.ts
+++ b/src/remote/activitypub/renderer/accept.ts
@ -1,4 +1,8 @@
-export default (object: any) => ({
+import config from '../../../config';
+import { ILocalUser } from '../../../models/user';
+
+export default (object: any, user: ILocalUser) => ({
 	type: 'Accept',
+	actor: `${config.url}/users/${user._id}`,
 	object
 });
--- a/src/remote/activitypub/renderer/follow.ts
+++ b/src/remote/activitypub/renderer/follow.ts
@ -1,8 +1,14 @@
 import config from '../../../config';
 import { IUser, isLocalUser } from '../../../models/user';

-export default (follower: IUser, followee: IUser) => ({
+export default (follower: IUser, followee: IUser, requestId?: string) => {
+	const follow = {
 		type: 'Follow',
 		actor: isLocalUser(follower) ? `${config.url}/users/${follower._id}` : follower.uri,
 		object: isLocalUser(followee) ? `${config.url}/users/${followee._id}` : followee.uri
-});
+	} as any;
+
+	if (requestId) follow.id = requestId;
+
+	return follow;
+};
--- a/src/remote/activitypub/renderer/reject.ts
+++ b/src/remote/activitypub/renderer/reject.ts
@ -1,4 +1,8 @@
-export default (object: any) => ({
+import config from '../../../config';
+import { ILocalUser } from '../../../models/user';
+
+export default (object: any, user: ILocalUser) => ({
 	type: 'Reject',
+	actor: `${config.url}/users/${user._id}`,
 	object
 });
--- a/src/server/api/common/read-messaging-message.ts
+++ b/src/server/api/common/read-messaging-message.ts
@ -1,4 +1,5 @@
 import * as mongo from 'mongodb';
+import isObjectId from '../../../misc/is-objectid';
 import Message from '../../../models/messaging-message';
 import { IMessagingMessage as IMessage } from '../../../models/messaging-message';
 import { publishMainStream } from '../../../stream';
@ -15,21 +16,21 @@ export default (
 	message: string | string[] | IMessage | IMessage[] | mongo.ObjectID | mongo.ObjectID[]
 ) => new Promise<any>(async (resolve, reject) => {

-	const userId = mongo.ObjectID.prototype.isPrototypeOf(user)
+	const userId = isObjectId(user)
 		? user
 		: new mongo.ObjectID(user);

-	const otherpartyId = mongo.ObjectID.prototype.isPrototypeOf(otherparty)
+	const otherpartyId = isObjectId(otherparty)
 		? otherparty
 		: new mongo.ObjectID(otherparty);

 	const ids: mongo.ObjectID[] = Array.isArray(message)
-		? mongo.ObjectID.prototype.isPrototypeOf(message[0])
+		? isObjectId(message[0])
 			? (message as mongo.ObjectID[])
 			: typeof message[0] === 'string'
 				? (message as string[]).map(m => new mongo.ObjectID(m))
 				: (message as IMessage[]).map(m => m._id)
-		: mongo.ObjectID.prototype.isPrototypeOf(message)
+		: isObjectId(message)
 			? [(message as mongo.ObjectID)]
 			: typeof message === 'string'
 				? [new mongo.ObjectID(message)]
--- a/src/server/api/common/read-notification.ts
+++ b/src/server/api/common/read-notification.ts
@ -1,4 +1,5 @@
 import * as mongo from 'mongodb';
+import isObjectId from '../../../misc/is-objectid';
 import { default as Notification, INotification } from '../../../models/notification';
 import { publishMainStream } from '../../../stream';
 import Mute from '../../../models/mute';
@ -12,17 +13,17 @@ export default (
 	message: string | string[] | INotification | INotification[] | mongo.ObjectID | mongo.ObjectID[]
 ) => new Promise<any>(async (resolve, reject) => {

-	const userId = mongo.ObjectID.prototype.isPrototypeOf(user)
+	const userId = isObjectId(user)
 		? user
 		: new mongo.ObjectID(user);

 	const ids: mongo.ObjectID[] = Array.isArray(message)
-		? mongo.ObjectID.prototype.isPrototypeOf(message[0])
+		? isObjectId(message[0])
 			? (message as mongo.ObjectID[])
 			: typeof message[0] === 'string'
 				? (message as string[]).map(m => new mongo.ObjectID(m))
 				: (message as INotification[]).map(m => m._id)
-		: mongo.ObjectID.prototype.isPrototypeOf(message)
+		: isObjectId(message)
 			? [(message as mongo.ObjectID)]
 			: typeof message === 'string'
 				? [new mongo.ObjectID(message)]
--- a/src/server/api/endpoints/drive/files/update.ts
+++ b/src/server/api/endpoints/drive/files/update.ts
@ -100,8 +100,10 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
 	}).then(notes => {
 		notes.forEach(note => {
 			note._files[note._files.findIndex(f => f._id.equals(file._id))] = file;
-			Note.findOneAndUpdate({ _id: note._id }, {
+			Note.update({ _id: note._id }, {
+				$set: {
 					_files: note._files
+				}
 			});
 		});
 	});
--- a/src/server/api/endpoints/i/update.ts
+++ b/src/server/api/endpoints/i/update.ts
@ -101,7 +101,7 @@ export const meta = {

 export default async (params: any, user: ILocalUser, app: IApp) => new Promise(async (res, rej) => {
 	const [ps, psErr] = getParams(meta, params);
-	if (psErr) throw psErr;
+	if (psErr) return rej(psErr);

 	const isSecure = user != null && app == null;

--- a/src/server/api/endpoints/meta.ts
+++ b/src/server/api/endpoints/meta.ts
@ -55,7 +55,8 @@ export default (params: any, me: ILocalUser) => new Promise(async (res, rej) =>
 			recaptcha: config.recaptcha ? true : false,
 			objectStorage: config.drive && config.drive.storage === 'minio',
 			twitter: config.twitter ? true : false,
-			serviceWorker: config.sw ? true : false
+			serviceWorker: config.sw ? true : false,
+			userRecommendation: config.user_recommendation ? config.user_recommendation : {}
 		}
 	});
 });
--- a/src/server/api/index.ts
+++ b/src/server/api/index.ts
@ -46,6 +46,8 @@ router.post('/signin', require('./private/signin').default);
 router.use(require('./service/github').routes());
 router.use(require('./service/twitter').routes());

+router.use(require('./mastodon').routes());
+
 // Return 404 for unknown API
 router.all('*', async ctx => {
 	ctx.status = 404;
@ -54,4 +56,4 @@ router.all('*', async ctx => {
 // Register router
 app.use(router.routes());

-module.exports = app;
+export default app;
--- a/src/server/api/mastodon.ts
+++ b/src/server/api/mastodon.ts
@ -0,0 +1,14 @@
+import * as Router from 'koa-router';
+import User from '../../models/user';
+import { toASCII } from 'punycode';
+
+// Init router
+const router = new Router();
+
+router.get('/v1/instance/peers', async ctx => {
+	const peers = await User.distinct('host', { host: { $ne: null } }) as any as string[];
+	const punyCodes = peers.map(peer => toASCII(peer));
+	ctx.body = punyCodes;
+});
+
+module.exports = router;
--- a/src/server/api/private/signin.ts
+++ b/src/server/api/private/signin.ts
@ -12,9 +12,8 @@ export default async (ctx: Koa.Context) => {
 	ctx.set('Access-Control-Allow-Credentials', 'true');

 	const body = ctx.request.body as any;
-	// See: https://github.com/syuilo/misskey/issues/2384
-	const username = body['username'] || body['x'];
-	const password = body['password'] || body['y'];
+	const username = body['username'];
+	const password = body['password'];
 	const token = body['token'];

 	if (typeof username != 'string') {
--- a/src/server/api/private/signup.ts
+++ b/src/server/api/private/signup.ts
@ -132,6 +132,12 @@ export default async (ctx: Koa.Context) => {

 	updateUserStats(account, true);

-	// Response
-	ctx.body = await pack(account);
+	const res = await pack(account, account, {
+		detail: true,
+		includeSecrets: true
+	});
+
+	res.token = secret;
+
+	ctx.body = res;
 };
--- a/src/server/index.ts
+++ b/src/server/index.ts
@ -18,6 +18,7 @@ import activityPub from './activitypub';
 import webFinger from './webfinger';
 import config from '../config';
 import { updateNetworkStats } from '../services/update-chart';
+import apiServer from './api';

 // Init app
 const app = new Koa();
@ -47,7 +48,7 @@ if (config.url.startsWith('https')) {
 	});
 }

-app.use(mount('/api', require('./api')));
+app.use(mount('/api', apiServer));
 app.use(mount('/files', require('./file')));

 // Init router
--- a/src/services/following/create.ts
+++ b/src/services/following/create.ts
@ -10,13 +10,13 @@ import renderAccept from '../../remote/activitypub/renderer/accept';
 import { deliver } from '../../queue';
 import createFollowRequest from './requests/create';

-export default async function(follower: IUser, followee: IUser) {
+export default async function(follower: IUser, followee: IUser, requestId?: string) {
 	// フォロー対象が鍵アカウントである or
 	// フォロワーがBotであり、フォロー対象がBotからのフォローに慎重である or
 	// フォロワーがローカルユーザーであり、フォロー対象がリモートユーザーである
 	// 上記のいずれかに当てはまる場合はすぐフォローせずにフォローリクエストを発行しておく
 	if (followee.isLocked || (followee.carefulBot && follower.isBot) || (isLocalUser(follower) && isRemoteUser(followee))) {
-		await createFollowRequest(follower, followee);
+		await createFollowRequest(follower, followee, requestId);
 		return;
 	}

@ -79,7 +79,7 @@ export default async function(follower: IUser, followee: IUser) {
 	}

 	if (isRemoteUser(follower) && isLocalUser(followee)) {
-		const content = pack(renderAccept(renderFollow(follower, followee)));
+		const content = pack(renderAccept(renderFollow(follower, followee, requestId), followee));
 		deliver(followee, content, follower.inbox);
 	}
 }
--- a/src/services/following/requests/accept.ts
+++ b/src/services/following/requests/accept.ts
@ -29,7 +29,12 @@ export default async function(followee: IUser, follower: IUser) {
 	});

 	if (isRemoteUser(follower)) {
-		const content = pack(renderAccept(renderFollow(follower, followee)));
+		const request = await FollowRequest.findOne({
+			followeeId: followee._id,
+			followerId: follower._id
+		});
+
+		const content = pack(renderAccept(renderFollow(follower, followee, request.requestId), followee as ILocalUser));
 		deliver(followee as ILocalUser, content, follower.inbox);
 	}

--- a/src/services/following/requests/create.ts
+++ b/src/services/following/requests/create.ts
@ -6,11 +6,12 @@ import renderFollow from '../../../remote/activitypub/renderer/follow';
 import { deliver } from '../../../queue';
 import FollowRequest from '../../../models/follow-request';

-export default async function(follower: IUser, followee: IUser) {
+export default async function(follower: IUser, followee: IUser, requestId?: string) {
 	await FollowRequest.insert({
 		createdAt: new Date(),
 		followerId: follower._id,
 		followeeId: followee._id,
+		requestId,

 		// 非正規化
 		_follower: {
--- a/src/services/following/requests/reject.ts
+++ b/src/services/following/requests/reject.ts
@ -8,7 +8,12 @@ import { publishMainStream } from '../../../stream';

 export default async function(followee: IUser, follower: IUser) {
 	if (isRemoteUser(follower)) {
-		const content = pack(renderReject(renderFollow(follower, followee)));
+		const request = await FollowRequest.findOne({
+			followeeId: followee._id,
+			followerId: follower._id
+		});
+
+		const content = pack(renderReject(renderFollow(follower, followee, request.requestId), followee as ILocalUser));
 		deliver(followee as ILocalUser, content, follower.inbox);
 	}

--- a/src/services/i/pin.ts
+++ b/src/services/i/pin.ts
@ -1,7 +1,7 @@
 import config from '../../config';
 import * as mongo from 'mongodb';
 import User, { isLocalUser, isRemoteUser, ILocalUser, IUser } from '../../models/user';
-import Note from '../../models/note';
+import Note, { packMany } from '../../models/note';
 import Following from '../../models/following';
 import renderAdd from '../../remote/activitypub/renderer/add';
 import renderRemove from '../../remote/activitypub/renderer/remove';
@ -27,11 +27,11 @@ export async function addPinned(user: IUser, noteId: mongo.ObjectID) {
 	let pinnedNoteIds = user.pinnedNoteIds || [];

 	//#region 現在ピン留め投稿している投稿が実際にデータベースに存在しているのかチェック
-	// データベースの欠損などで存在していない場合があるので。
+	// データベースの欠損などで存在していない(または破損している)場合があるので。
 	// 存在していなかったらピン留め投稿から外す
-	const pinnedNotes = (await Promise.all(pinnedNoteIds.map(id => Note.findOne({ _id: id })))).filter(x => x != null);
+	const pinnedNotes = await packMany(pinnedNoteIds, null, { detail: true });

-	pinnedNoteIds = pinnedNoteIds.filter(id => pinnedNotes.some(n => n._id.equals(id)));
+	pinnedNoteIds = pinnedNoteIds.filter(id => pinnedNotes.some(n => n.id.toString() === id.toHexString()));
 	//#endregion

 	if (pinnedNoteIds.length >= 5) {
--- a/src/services/note/reaction/create.ts
+++ b/src/services/note/reaction/create.ts
@ -26,7 +26,7 @@ export default async (user: IUser, note: INote, reaction: string) => new Promise
 	} catch (e) {
 		// duplicate key error
 		if (e.code === 11000) {
-			return res(null);
+			return rej('already reacted');
 		}

 		console.error(e);
--- a/src/services/note/read.ts
+++ b/src/services/note/read.ts
@ -1,4 +1,5 @@
 import * as mongo from 'mongodb';
+import isObjectId from '../../misc/is-objectid';
 import { publishMainStream } from '../../stream';
 import User from '../../models/user';
 import NoteUnread from '../../models/note-unread';
@ -11,11 +12,11 @@ export default (
 	note: string | mongo.ObjectID
 ) => new Promise<any>(async (resolve, reject) => {

-	const userId: mongo.ObjectID = mongo.ObjectID.prototype.isPrototypeOf(user)
+	const userId: mongo.ObjectID = isObjectId(user)
 		? user as mongo.ObjectID
 		: new mongo.ObjectID(user);

-	const noteId: mongo.ObjectID = mongo.ObjectID.prototype.isPrototypeOf(note)
+	const noteId: mongo.ObjectID = isObjectId(note)
 		? note as mongo.ObjectID
 		: new mongo.ObjectID(note);

--- a/test/api.ts
+++ b/test/api.ts
--- a/test/mfm.ts
+++ b/test/mfm.ts
@ -1,3 +1,7 @@
+/*
+ * Tests of MFM
+ */
+
 import * as assert from 'assert';

 import analyze from '../src/mfm/parse';
@ -8,9 +12,9 @@ describe('Text', () => {
 	it('can be analyzed', () => {
 		const tokens = analyze('@himawari @hima_sub@namori.net お腹ペコい :cat: #yryr');
 		assert.deepEqual([
-			{ type: 'mention', content: '@himawari', username: 'himawari', host: null },
+			{ type: 'mention', content: '@himawari', canonical: '@himawari', username: 'himawari', host: null },
 			{ type: 'text', content: ' '},
-			{ type: 'mention', content: '@hima_sub@namori.net', username: 'hima_sub', host: 'namori.net' },
+			{ type: 'mention', content: '@hima_sub@namori.net', canonical: '@hima_sub@namori.net', username: 'hima_sub', host: 'namori.net' },
 			{ type: 'text', content: ' お腹ペコい ' },
 			{ type: 'emoji', content: ':cat:', emoji: 'cat'},
 			{ type: 'text', content: ' '},
@ -58,7 +62,7 @@ describe('Text', () => {
 			it('local', () => {
 				const tokens = analyze('@himawari お腹ペコい');
 				assert.deepEqual([
-					{ type: 'mention', content: '@himawari', username: 'himawari', host: null },
+					{ type: 'mention', content: '@himawari', canonical: '@himawari', username: 'himawari', host: null },
 					{ type: 'text', content: ' お腹ペコい' }
 				], tokens);
 			});
@ -66,7 +70,15 @@ describe('Text', () => {
 			it('remote', () => {
 				const tokens = analyze('@hima_sub@namori.net お腹ペコい');
 				assert.deepEqual([
-					{ type: 'mention', content: '@hima_sub@namori.net', username: 'hima_sub', host: 'namori.net' },
+					{ type: 'mention', content: '@hima_sub@namori.net', canonical: '@hima_sub@namori.net', username: 'hima_sub', host: 'namori.net' },
+					{ type: 'text', content: ' お腹ペコい' }
+				], tokens);
+			});
+
+			it('remote punycode', () => {
+				const tokens = analyze('@hima_sub@xn--q9j5bya.xn--zckzah お腹ペコい');
+				assert.deepEqual([
+					{ type: 'mention', content: '@hima_sub@xn--q9j5bya.xn--zckzah', canonical: '@hima_sub@なもり.テスト', username: 'hima_sub', host: 'xn--q9j5bya.xn--zckzah' },
 					{ type: 'text', content: ' お腹ペコい' }
 				], tokens);
 			});
Author	SHA1	Message	Date
syuilo	1bec4e2d12	10.20.0	2018-10-16 11:44:35 +09:00
syuilo	03cd1d27bf	New Crowdin translations (#2910 ) * New translations ja-JP.yml (German) * New translations ja-JP.yml (German) * New translations ja-JP.yml (German)	2018-10-16 11:38:43 +09:00
syuilo	9427a756c9	Update mongodb	2018-10-16 11:38:09 +09:00
greenkeeper[bot]	d32b2a8ce5	fix(package): update @types/node to version 10.12.0 (#2912 )	2018-10-16 10:46:45 +09:00
greenkeeper[bot]	15473b4368	fix(package): update @types/webpack to version 4.4.17 (#2911 )	2018-10-16 10:46:38 +09:00
syuilo	54de0dc4a7	Update config for CI	2018-10-16 10:36:27 +09:00
syuilo	0162eaf826	Update signin.ts	2018-10-16 10:33:05 +09:00
syuilo	572cfafbe1	Add some API tests	2018-10-16 10:18:47 +09:00
syuilo	4d6335ce9a	Add some tests and fix	2018-10-16 09:45:36 +09:00
syuilo	1c9c4af9f1	Merge branch 'develop' of https://github.com/syuilo/misskey into develop	2018-10-16 08:58:54 +09:00
syuilo	a6844ebc9d	Add some tests	2018-10-16 08:58:45 +09:00
MeiMei	072492c29b	Implement /api/v1/instance/peers (#2913 ) * Implement /api/v1/instance/peers * Use punycode * Remove Cache-Control * Rename	2018-10-16 08:55:55 +09:00
syuilo	99da4f9839	Add some tests and some fixes	2018-10-16 08:54:36 +09:00
syuilo	88664486af	Refactor	2018-10-16 08:27:20 +09:00
syuilo	80daf7c749	Implement API tests	2018-10-16 06:37:21 +09:00
greenkeeper[bot]	beb2f7e558	fix(package): update @types/sharp to version 0.21.0 (#2908 )	2018-10-16 05:21:07 +09:00
greenkeeper[bot]	6243184c95	fix(package): update @types/gulp-uglify to version 3.0.6 (#2906 )	2018-10-16 05:20:57 +09:00
syuilo	1b3baef966	Merge pull request #2898 from syuilo/l10n_develop New Crowdin translations	2018-10-16 05:20:40 +09:00
greenkeeper[bot]	98f38ee29b	fix(package): update vue-svg-inline-loader to version 1.2.1 (#2909 )	2018-10-16 05:20:17 +09:00
greenkeeper[bot]	09b82bfea4	fix(package): update chart.js to version 2.7.3 (#2907 )	2018-10-16 05:20:02 +09:00
syuilo	937f686264	New translations ja-JP.yml (Russian)	2018-10-15 20:53:38 +09:00
syuilo	9bc9cbac21	New translations ja-JP.yml (English)	2018-10-15 18:22:42 +09:00
syuilo	6024550158	New translations ja-JP.yml (Norwegian)	2018-10-15 18:14:29 +09:00
syuilo	4ae5f82171	New translations ja-JP.yml (Dutch)	2018-10-15 18:14:23 +09:00
syuilo	6d2c9dcee9	New translations ja-JP.yml (Japanese, Kansai)	2018-10-15 18:14:18 +09:00
syuilo	0f1b0e1870	New translations ja-JP.yml (Spanish)	2018-10-15 18:14:11 +09:00
syuilo	81c682cdc8	New translations ja-JP.yml (Russian)	2018-10-15 18:14:05 +09:00
syuilo	ab9fa67d9f	New translations ja-JP.yml (Portuguese)	2018-10-15 18:14:00 +09:00
syuilo	9537fce335	New translations ja-JP.yml (Polish)	2018-10-15 18:13:53 +09:00
syuilo	9d97e7e348	New translations ja-JP.yml (Korean)	2018-10-15 18:13:48 +09:00
syuilo	ebe7939412	New translations ja-JP.yml (Italian)	2018-10-15 18:13:43 +09:00
syuilo	807e3e8ca7	New translations ja-JP.yml (German)	2018-10-15 18:13:37 +09:00
syuilo	a59faf9117	New translations ja-JP.yml (French)	2018-10-15 18:13:32 +09:00
syuilo	d786036155	New translations ja-JP.yml (English)	2018-10-15 18:13:25 +09:00
syuilo	61d6ed5489	New translations ja-JP.yml (Chinese Simplified)	2018-10-15 18:13:21 +09:00
syuilo	b38200d48a	New translations ja-JP.yml (Catalan)	2018-10-15 18:13:16 +09:00
syuilo	a0c396a842	10.19.0	2018-10-15 18:03:28 +09:00
syuilo	88fbc53e37	Resolve #2314	2018-10-15 18:02:57 +09:00
syuilo	a2206b2d52	🎨	2018-10-15 17:55:59 +09:00
syuilo	a95ff447d7	🎨	2018-10-15 17:43:25 +09:00
MeiMei	49dbd7f9d2	Fix following from Preroma does not complete (#2905 ) * In Follow Accept/Reject, send previous received id * In Follow Accept/Reject, send Activity.actor	2018-10-15 16:51:22 +09:00
syuilo	2ad2779096	10.18.0	2018-10-15 06:03:50 +09:00
syuilo	23045369aa	🎨	2018-10-15 06:03:15 +09:00
syuilo	116faf26e6	10.17.0	2018-10-15 05:29:58 +09:00
syuilo	2582b8d132	🎨	2018-10-15 05:28:35 +09:00
syuilo	63f7941073	🎨	2018-10-15 05:18:39 +09:00
syuilo	676f026085	🎨	2018-10-15 04:36:31 +09:00
syuilo	a13319fd86	New translations ja-JP.yml (Norwegian)	2018-10-14 19:52:13 +09:00
syuilo	be8765278c	New translations ja-JP.yml (Dutch)	2018-10-14 19:52:08 +09:00
syuilo	c8bb3dc209	New translations ja-JP.yml (Japanese, Kansai)	2018-10-14 19:52:03 +09:00
syuilo	ea16befb73	New translations ja-JP.yml (Spanish)	2018-10-14 19:51:59 +09:00
syuilo	20b1bb7681	New translations ja-JP.yml (Russian)	2018-10-14 19:51:55 +09:00
syuilo	bd10eb50eb	New translations ja-JP.yml (Portuguese)	2018-10-14 19:51:50 +09:00
syuilo	d47c0eb31a	New translations ja-JP.yml (Polish)	2018-10-14 19:51:45 +09:00
syuilo	177e8bb19f	New translations ja-JP.yml (Korean)	2018-10-14 19:51:41 +09:00
syuilo	d156111637	New translations ja-JP.yml (Italian)	2018-10-14 19:51:37 +09:00
syuilo	8c13d3e50b	New translations ja-JP.yml (German)	2018-10-14 19:51:33 +09:00
syuilo	6ff01016f0	New translations ja-JP.yml (French)	2018-10-14 19:51:30 +09:00
syuilo	5d659da012	New translations ja-JP.yml (English)	2018-10-14 19:51:26 +09:00
syuilo	28e7552a1a	New translations ja-JP.yml (Chinese Simplified)	2018-10-14 19:51:21 +09:00
syuilo	53d264814b	New translations ja-JP.yml (Catalan)	2018-10-14 19:51:15 +09:00
syuilo	2d6b20d34b	10.16.0	2018-10-14 19:45:51 +09:00
syuilo	99073b56df	Resolve #2900	2018-10-14 19:44:30 +09:00
MeiMei	5dce81c0db	非ASCIIなドメインへのメンションの修正 (#2903 ) * punycodeでされたmentionのラベルをunicodeとして表示する * post-form mentionはpunycodeにする * mentionの表示はURLもAPI向けもunicodeにする	2018-10-14 16:56:19 +09:00
Hakaba Hitoyo	be82d845a4	expose user recommendation config in /api/meta (#2902 )	2018-10-14 16:54:09 +09:00
syuilo	f49ccd0cd3	10.15.0	2018-10-14 10:17:04 +09:00
syuilo	69d83f535d	Clean up	2018-10-14 10:16:07 +09:00
syuilo	c7988fb6f5	🎨	2018-10-14 10:16:02 +09:00
syuilo	3961fd08c9	Fix #2901	2018-10-14 10:06:10 +09:00
syuilo	e3faf64061	10.14.0	2018-10-14 09:49:16 +09:00
syuilo	ed83993e15	Fix	2018-10-14 09:48:47 +09:00
syuilo	0f8847bb74	Resolve #2618	2018-10-14 09:47:38 +09:00
syuilo	a72cfa7535	Merge branch 'develop' of https://github.com/syuilo/misskey into develop	2018-10-14 06:46:49 +09:00
syuilo	514b74a19d	Clean up	2018-10-14 06:44:20 +09:00
syuilo	a2c124306f	Update mios.ts	2018-10-14 05:26:36 +09:00
syuilo	273f67e268	Fix bug	2018-10-13 23:12:48 +09:00
syuilo	935b074a7a	New translations ja-JP.yml (Norwegian)	2018-10-13 20:12:19 +09:00
syuilo	9d9c609bfb	New translations ja-JP.yml (Dutch)	2018-10-13 20:12:15 +09:00
syuilo	f6a664f181	New translations ja-JP.yml (Japanese, Kansai)	2018-10-13 20:12:10 +09:00
syuilo	fce68d1f75	New translations ja-JP.yml (Spanish)	2018-10-13 20:12:06 +09:00
syuilo	88739c2444	New translations ja-JP.yml (Russian)	2018-10-13 20:12:02 +09:00
syuilo	7e2f10fce3	New translations ja-JP.yml (Portuguese)	2018-10-13 20:11:58 +09:00
syuilo	a494c3a5cc	New translations ja-JP.yml (Polish)	2018-10-13 20:11:53 +09:00
syuilo	d6bb702883	New translations ja-JP.yml (Korean)	2018-10-13 20:11:48 +09:00
syuilo	d15a972c68	New translations ja-JP.yml (Italian)	2018-10-13 20:11:44 +09:00
syuilo	2ae7d31725	New translations ja-JP.yml (German)	2018-10-13 20:11:40 +09:00
syuilo	2e329b1888	New translations ja-JP.yml (French)	2018-10-13 20:11:36 +09:00
syuilo	522d40328b	New translations ja-JP.yml (English)	2018-10-13 20:11:32 +09:00
syuilo	2ecbff45bf	New translations ja-JP.yml (Chinese Simplified)	2018-10-13 20:11:28 +09:00
syuilo	b6f7282c13	New translations ja-JP.yml (Catalan)	2018-10-13 20:11:24 +09:00