2.24.2

New Crowdin translations

locales/de.yml

@@ -3,7 +3,9 @@ meta:
   lang: "Deutsch"
   divider: ""
 common:
-  misskey: "Teile alles mit anderen mithilfe von Misskey"
+  misskey: "A planet of fediverse"
+  about-title: "A ⭐ of fediverse."
+  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
   time:
     unknown: "Unbekannt"
     future: "Zukunft"
@@ -33,12 +35,20 @@ common:
     angry: "Wütend"
     confused: "Verwirrt"
     pudding: "Pudding"
+  note-placeholders:
+    a: "今どうしてる？"
+    b: "何かありましたか？"
+    c: "何をお考えですか？"
+    d: "言いたいことは？"
+    e: "ここに書いてください"
+    f: "あなたが書くのを待っています..."
   delete: "Löschen"
   loading: "Laden"
   ok: "OK"
   update-available: "Eine neue Version von Misskey ist verfügbar ({newer}, aktuell ist {current}). Lade die Seite neu um die aktuelle Version zu laden"
   my-token-regenerated: "Dein Token wurde generiert. Du wirst jetzt abgemeldet."
   widgets:
+    analog-clock: "アナログ時計"
     profile: "プロフィール"
     calendar: "カレンダー"
     timemachine: "カレンダー(タイムマシン)"
@@ -317,15 +327,14 @@ desktop/views/components/note-detail.vue:
   location: "Ort"
   renote: "Anmerkung"
   add-reaction: "Reaktion hinzufügen"
-desktop/views/components/note-detail.sub.vue:
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
 desktop/views/components/notes.note.vue:
   reposted-by: "Auch geteilt von"
   reply: "Antworten"
   renote: "Anmerken"
   add-reaction: "Eine Reaktion hinzufügen"
   detail: "Zeige Details"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
 desktop/views/components/notes.vue:
   error: "Laden fehlgeschlagen."
   retry: "Erneut versuchen"
@@ -333,10 +342,9 @@ desktop/views/components/notifications.vue:
   more: "Mehr"
   empty: "Keine Benachrichtigungen"
 desktop/views/components/post-form.vue:
-  note-placeholder: "Was ist bei dir los?"
   reply-placeholder: "Antworte auf diese Anmerkung..."
   quote-placeholder: "Zitiere diese Anmerkung..."
-  note: "Post"
+  submit: "投稿"
   reply: "Antworten"
   renote: "Anmerkung"
   posted: "Gepostet!"
@@ -537,6 +545,8 @@ desktop/views/components/window.vue:
   popout: "ポップアウト"
   close: "閉じる"
 desktop/views/pages/welcome.vue:
+  about: "詳しく..."
+  gotit: "わかった"
   signin: "ログイン"
   signup: "新規登録"
   signin-button: "やってる"
@@ -603,7 +613,6 @@ desktop/views/widgets/polls.vue:
 desktop/views/widgets/post-form.vue:
   title: "投稿"
   note: "投稿"
-  placeholder: "いまどうしてる？"
 desktop/views/widgets/profile.vue:
   update-banner: "クリックでバナー編集"
   update-avatar: "クリックでアバター編集"
@@ -685,9 +694,8 @@ mobile/views/components/post-form.vue:
   submit: "投稿"
   reply: "返信"
   renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
   reply-placeholder: "この投稿への返信..."
-  note-placeholder: "いまどうしてる？"
   cw-placeholder: "内容への注釈 (オプション)"
   location-alert: "お使いの端末は位置情報に対応していません"
   error: "エラー"
@@ -701,11 +709,16 @@ mobile/views/components/timeline.vue:
   empty: "投稿がありません"
   load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
   notifications: "通知"
   messaging: "メッセージ"
   search: "検索"
   drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
   settings: "設定"
   about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
@@ -716,8 +729,14 @@ mobile/views/components/users-list.vue:
   all: "すべて"
   known: "知り合い"
   load-more: "もっと"
+mobile/views/pages/favorites.vue:
+  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
   drive: "ドライブ"
+  more: "もっと見る"
 mobile/views/pages/followers.vue:
   followers-of: "{}のフォロワー"
 mobile/views/pages/following.vue:

locales/en.yml

@@ -3,7 +3,9 @@ meta:
   lang: "English"
   divider: ""
 common:
-  misskey: "Share everything with others using Misskey."
+  misskey: "A planet of fediverse"
+  about-title: "A ⭐ of fediverse."
+  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
   time:
     unknown: "unknown"
     future: "future"
@@ -33,12 +35,20 @@ common:
     angry: "Angry"
     confused: "Confused"
     pudding: "Pudding"
+  note-placeholders:
+    a: "What are you doing?"
+    b: "What's happening?"
+    c: "What’s on your mind?"
+    d: "Do you want to say something?"
+    e: "Write here!"
+    f: "Waiting for your writing."
   delete: "Delete"
   loading: "Loading"
   ok: "OK"
   update-available: "A new version of Misskey is now available({newer}, current is {current}). Reload the page to apply the update."
   my-token-regenerated: "Your token has been generated. You will now get logged out."
   widgets:
+    analog-clock: "Analog clock"
     profile: "Profile"
     calendar: "Calendar"
     timemachine: "Calendar (Time Machine)"
@@ -317,15 +327,14 @@ desktop/views/components/note-detail.vue:
   location: "Location"
   renote: "Renote"
   add-reaction: "Add a reaction"
-desktop/views/components/note-detail.sub.vue:
-  private: "this post is private"
-  deleted: "this post has been deleted"
 desktop/views/components/notes.note.vue:
   reposted-by: "Reposted by {}"
   reply: "Reply"
   renote: "Renote"
   add-reaction: "Add a reaction"
   detail: "Show detail"
+  private: "this post is private"
+  deleted: "this post has been deleted"
 desktop/views/components/notes.vue:
   error: "Loading failed."
   retry: "Retry"
@@ -333,10 +342,9 @@ desktop/views/components/notifications.vue:
   more: "More"
   empty: "No notifications"
 desktop/views/components/post-form.vue:
-  note-placeholder: "What's happening?"
   reply-placeholder: "Reply to this note..."
   quote-placeholder: "Quote this note..."
-  note: "Post"
+  submit: "Post"
   reply: "Reply"
   renote: "Renote"
   posted: "Posted!"
@@ -537,6 +545,8 @@ desktop/views/components/window.vue:
   popout: "Popout"
   close: "Close"
 desktop/views/pages/welcome.vue:
+  about: "about"
+  gotit: "Got it!"
   signin: "Log In"
   signup: "Sign up"
   signin-button: "Log in"
@@ -603,7 +613,6 @@ desktop/views/widgets/polls.vue:
 desktop/views/widgets/post-form.vue:
   title: "Post"
   note: "Post"
-  placeholder: "What's happening?"
 desktop/views/widgets/profile.vue:
   update-banner: "Click to edit your banner"
   update-avatar: "Click to edit your avatar"
@@ -685,9 +694,8 @@ mobile/views/components/post-form.vue:
   submit: "Post"
   reply: "Reply"
   renote: "Renote"
-  renote-placeholder: "Quote this post. (optional)"
+  quote-placeholder: "Quote this post... (optional)"
   reply-placeholder: "Reply to this note..."
-  note-placeholder: "What's happening?"
   cw-placeholder: "内容への注釈 (オプション)"
   location-alert: "お使いの端末は位置情報に対応していません"
   error: "Error"
@@ -701,11 +709,16 @@ mobile/views/components/timeline.vue:
   empty: "No notes"
   load-more: "More"
 mobile/views/components/ui.nav.vue:
-  home: "Home"
+  timeline: "Timeline"
   notifications: "Notifications"
   messaging: "Messages"
   search: "Search"
   drive: "Drive"
+  favorites: "Favorites"
+  user-lists: "Lists"
+  widgets: "Widgets"
+  game: "Games"
+  darkmode: "Dark mode"
   settings: "Settings"
   about: "About Misskey"
 mobile/views/components/user-timeline.vue:
@@ -716,8 +729,14 @@ mobile/views/components/users-list.vue:
   all: "All"
   known: "You know"
   load-more: "More"
+mobile/views/pages/favorites.vue:
+  title: "Favorites"
+mobile/views/pages/user-lists.vue:
+  title: "Lists"
+  enter-list-name: "Enter list name"
 mobile/views/pages/drive.vue:
   drive: "Drive"
+  more: "Load more"
 mobile/views/pages/followers.vue:
   followers-of: "Followers of {}"
 mobile/views/pages/following.vue:

locales/es.yml

@@ -3,7 +3,9 @@ meta:
   lang: "日本語"
   divider: ""
 common:
-  misskey: "Misskeyで皆と共有しよう。"
+  misskey: "A planet of fediverse"
+  about-title: "A ⭐ of fediverse."
+  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
   time:
     unknown: "なぞのじかん"
     future: "未来"
@@ -33,12 +35,20 @@ common:
     angry: "おこ"
     confused: "こまこまのこまり"
     pudding: "Pudding"
+  note-placeholders:
+    a: "今どうしてる？"
+    b: "何かありましたか？"
+    c: "何をお考えですか？"
+    d: "言いたいことは？"
+    e: "ここに書いてください"
+    f: "あなたが書くのを待っています..."
   delete: "削除"
   loading: "読み込み中"
   ok: "わかった"
   update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   widgets:
+    analog-clock: "アナログ時計"
     profile: "プロフィール"
     calendar: "カレンダー"
     timemachine: "カレンダー(タイムマシン)"
@@ -317,15 +327,14 @@ desktop/views/components/note-detail.vue:
   location: "位置情報"
   renote: "Renote"
   add-reaction: "リアクション"
-desktop/views/components/note-detail.sub.vue:
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
 desktop/views/components/notes.note.vue:
   reposted-by: "{}がRenote"
   reply: "返信"
   renote: "Renote"
   add-reaction: "リアクション"
   detail: "詳細"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
 desktop/views/components/notes.vue:
   error: "読み込みに失敗しました。"
   retry: "リトライ"
@@ -333,10 +342,9 @@ desktop/views/components/notifications.vue:
   more: "もっと見る"
   empty: "ありません！"
 desktop/views/components/post-form.vue:
-  note-placeholder: "いまどうしてる？"
   reply-placeholder: "この投稿への返信..."
   quote-placeholder: "この投稿を引用..."
-  note: "投稿"
+  submit: "投稿"
   reply: "返信"
   renote: "Renote"
   posted: "投稿しました！"
@@ -537,6 +545,8 @@ desktop/views/components/window.vue:
   popout: "ポップアウト"
   close: "閉じる"
 desktop/views/pages/welcome.vue:
+  about: "詳しく..."
+  gotit: "わかった"
   signin: "ログイン"
   signup: "新規登録"
   signin-button: "やってる"
@@ -603,7 +613,6 @@ desktop/views/widgets/polls.vue:
 desktop/views/widgets/post-form.vue:
   title: "投稿"
   note: "投稿"
-  placeholder: "いまどうしてる？"
 desktop/views/widgets/profile.vue:
   update-banner: "クリックでバナー編集"
   update-avatar: "クリックでアバター編集"
@@ -685,9 +694,8 @@ mobile/views/components/post-form.vue:
   submit: "投稿"
   reply: "返信"
   renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
   reply-placeholder: "この投稿への返信..."
-  note-placeholder: "いまどうしてる？"
   cw-placeholder: "内容への注釈 (オプション)"
   location-alert: "お使いの端末は位置情報に対応していません"
   error: "エラー"
@@ -701,11 +709,16 @@ mobile/views/components/timeline.vue:
   empty: "投稿がありません"
   load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
   notifications: "通知"
   messaging: "メッセージ"
   search: "検索"
   drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
   settings: "設定"
   about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
@@ -716,8 +729,14 @@ mobile/views/components/users-list.vue:
   all: "すべて"
   known: "知り合い"
   load-more: "もっと"
+mobile/views/pages/favorites.vue:
+  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
   drive: "ドライブ"
+  more: "もっと見る"
 mobile/views/pages/followers.vue:
   followers-of: "{}のフォロワー"
 mobile/views/pages/following.vue:

locales/fr.yml

@@ -3,7 +3,9 @@ meta:
   lang: "Français"
   divider: ""
 common:
-  misskey: "Partagez avec les autres en utilisant Misskey"
+  misskey: "A planet of fediverse"
+  about-title: "A ⭐ of fediverse."
+  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
   time:
     unknown: "inconnu"
     future: "future"
@@ -33,12 +35,20 @@ common:
     angry: "En Colère"
     confused: "Confus"
     pudding: "Pudding"
+  note-placeholders:
+    a: "今どうしてる？"
+    b: "何かありましたか？"
+    c: "何をお考えですか？"
+    d: "言いたいことは？"
+    e: "ここに書いてください"
+    f: "あなたが書くのを待っています..."
   delete: "Supprimer"
   loading: "Chargement"
   ok: "OK"
   update-available: "Une nouvelle version de Misskey est disponible({newer}, version actuelle: {current}). Recharger la page pour appliquer la mise à jour."
   my-token-regenerated: "Votre token vient d'être généré, vous allez maintenant être déconnecté."
   widgets:
+    analog-clock: "アナログ時計"
     profile: "プロフィール"
     calendar: "カレンダー"
     timemachine: "カレンダー(タイムマシン)"
@@ -317,15 +327,14 @@ desktop/views/components/note-detail.vue:
   location: "位置情報"
   renote: "Renote"
   add-reaction: "リアクション"
-desktop/views/components/note-detail.sub.vue:
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
 desktop/views/components/notes.note.vue:
   reposted-by: "Reposté par {}"
   reply: "Répondre"
   renote: "Renote"
   add-reaction: "Ajouter votre reaction"
   detail: "Afficher les détails"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
 desktop/views/components/notes.vue:
   error: "読み込みに失敗しました。"
   retry: "リトライ"
@@ -333,10 +342,9 @@ desktop/views/components/notifications.vue:
   more: "Plus"
   empty: "Pas de notifications"
 desktop/views/components/post-form.vue:
-  note-placeholder: "Qu'est-ce qui se passe?"
   reply-placeholder: "Répondre à cette note"
   quote-placeholder: "Citer cette note"
-  note: "Poster"
+  submit: "投稿"
   reply: "Répondre"
   renote: "Renote"
   posted: "Posté!"
@@ -537,6 +545,8 @@ desktop/views/components/window.vue:
   popout: "ポップアウト"
   close: "閉じる"
 desktop/views/pages/welcome.vue:
+  about: "詳しく..."
+  gotit: "わかった"
   signin: "ログイン"
   signup: "新規登録"
   signin-button: "やってる"
@@ -603,7 +613,6 @@ desktop/views/widgets/polls.vue:
 desktop/views/widgets/post-form.vue:
   title: "Post"
   note: "Post"
-  placeholder: "Qu'est-ce qu'il se passe?"
 desktop/views/widgets/profile.vue:
   update-banner: "クリックでバナー編集"
   update-avatar: "クリックでアバター編集"
@@ -685,9 +694,8 @@ mobile/views/components/post-form.vue:
   submit: "Poster"
   reply: "返信"
   renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
   reply-placeholder: "Répondre à cette note"
-  note-placeholder: "Qu'est-ce qu'il se passe?"
   cw-placeholder: "内容への注釈 (オプション)"
   location-alert: "お使いの端末は位置情報に対応していません"
   error: "エラー"
@@ -701,11 +709,16 @@ mobile/views/components/timeline.vue:
   empty: "Pas de notes"
   load-more: "Afficher plus"
 mobile/views/components/ui.nav.vue:
-  home: "Accueil"
+  timeline: "タイムライン"
   notifications: "Notifications"
   messaging: "Messages"
   search: "Rechercher"
   drive: "Drive"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
   settings: "Réglages"
   about: "À propose de Misskey"
 mobile/views/components/user-timeline.vue:
@@ -716,8 +729,14 @@ mobile/views/components/users-list.vue:
   all: "Tout"
   known: "Vous connaissez"
   load-more: "Afficher plus"
+mobile/views/pages/favorites.vue:
+  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
   drive: "Drive"
+  more: "もっと見る"
 mobile/views/pages/followers.vue:
   followers-of: "Abonnés de {}"
 mobile/views/pages/following.vue:

locales/it.yml

@@ -3,7 +3,9 @@ meta:
   lang: "日本語"
   divider: ""
 common:
-  misskey: "Misskeyで皆と共有しよう。"
+  misskey: "A planet of fediverse"
+  about-title: "A ⭐ of fediverse."
+  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
   time:
     unknown: "なぞのじかん"
     future: "未来"
@@ -33,12 +35,20 @@ common:
     angry: "おこ"
     confused: "こまこまのこまり"
     pudding: "Pudding"
+  note-placeholders:
+    a: "今どうしてる？"
+    b: "何かありましたか？"
+    c: "何をお考えですか？"
+    d: "言いたいことは？"
+    e: "ここに書いてください"
+    f: "あなたが書くのを待っています..."
   delete: "削除"
   loading: "読み込み中"
   ok: "わかった"
   update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   widgets:
+    analog-clock: "アナログ時計"
     profile: "プロフィール"
     calendar: "カレンダー"
     timemachine: "カレンダー(タイムマシン)"
@@ -317,15 +327,14 @@ desktop/views/components/note-detail.vue:
   location: "位置情報"
   renote: "Renote"
   add-reaction: "リアクション"
-desktop/views/components/note-detail.sub.vue:
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
 desktop/views/components/notes.note.vue:
   reposted-by: "{}がRenote"
   reply: "返信"
   renote: "Renote"
   add-reaction: "リアクション"
   detail: "詳細"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
 desktop/views/components/notes.vue:
   error: "読み込みに失敗しました。"
   retry: "リトライ"
@@ -333,10 +342,9 @@ desktop/views/components/notifications.vue:
   more: "もっと見る"
   empty: "ありません！"
 desktop/views/components/post-form.vue:
-  note-placeholder: "いまどうしてる？"
   reply-placeholder: "この投稿への返信..."
   quote-placeholder: "この投稿を引用..."
-  note: "投稿"
+  submit: "投稿"
   reply: "返信"
   renote: "Renote"
   posted: "投稿しました！"
@@ -537,6 +545,8 @@ desktop/views/components/window.vue:
   popout: "ポップアウト"
   close: "閉じる"
 desktop/views/pages/welcome.vue:
+  about: "詳しく..."
+  gotit: "わかった"
   signin: "ログイン"
   signup: "新規登録"
   signin-button: "やってる"
@@ -603,7 +613,6 @@ desktop/views/widgets/polls.vue:
 desktop/views/widgets/post-form.vue:
   title: "投稿"
   note: "投稿"
-  placeholder: "いまどうしてる？"
 desktop/views/widgets/profile.vue:
   update-banner: "クリックでバナー編集"
   update-avatar: "クリックでアバター編集"
@@ -685,9 +694,8 @@ mobile/views/components/post-form.vue:
   submit: "投稿"
   reply: "返信"
   renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
   reply-placeholder: "この投稿への返信..."
-  note-placeholder: "いまどうしてる？"
   cw-placeholder: "内容への注釈 (オプション)"
   location-alert: "お使いの端末は位置情報に対応していません"
   error: "エラー"
@@ -701,11 +709,16 @@ mobile/views/components/timeline.vue:
   empty: "投稿がありません"
   load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
   notifications: "通知"
   messaging: "メッセージ"
   search: "検索"
   drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
   settings: "設定"
   about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
@@ -716,8 +729,14 @@ mobile/views/components/users-list.vue:
   all: "すべて"
   known: "知り合い"
   load-more: "もっと"
+mobile/views/pages/favorites.vue:
+  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
   drive: "ドライブ"
+  more: "もっと見る"
 mobile/views/pages/followers.vue:
   followers-of: "{}のフォロワー"
 mobile/views/pages/following.vue:

locales/ja.yml

@@ -3,7 +3,9 @@ meta:
   divider: ""
 
 common:
-  misskey: "Misskeyで皆と共有しよう。"
+  misskey: "A planet of fediverse"
+  about-title: "A ⭐ of fediverse."
+  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
 
   time:
     unknown: "なぞのじかん"
@@ -37,6 +39,14 @@ common:
     confused: "こまこまのこまり"
     pudding: "Pudding"
 
+  note-placeholders:
+    a: "今どうしてる？"
+    b: "何かありましたか？"
+    c: "何をお考えですか？"
+    d: "言いたいことは？"
+    e: "ここに書いてください"
+    f: "あなたが書くのを待っています..."
+
   delete: "削除"
   loading: "読み込み中"
   ok: "わかった"
@@ -44,6 +54,7 @@ common:
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
 
   widgets:
+    analog-clock: "アナログ時計"
     profile: "プロフィール"
     calendar: "カレンダー"
     timemachine: "カレンダー(タイムマシン)"
@@ -369,10 +380,6 @@ desktop/views/components/note-detail.vue:
   renote: "Renote"
   add-reaction: "リアクション"
 
-desktop/views/components/note-detail.sub.vue:
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
-
 desktop/views/components/notes.note.vue:
   reposted-by: "{}がRenote"
   reply: "返信"
@@ -391,10 +398,9 @@ desktop/views/components/notifications.vue:
   empty: "ありません！"
 
 desktop/views/components/post-form.vue:
-  note-placeholder: "いまどうしてる？"
   reply-placeholder: "この投稿への返信..."
   quote-placeholder: "この投稿を引用..."
-  note: "投稿"
+  submit: "投稿"
   reply: "返信"
   renote: "Renote"
   posted: "投稿しました！"
@@ -631,6 +637,8 @@ desktop/views/components/window.vue:
   close: "閉じる"
 
 desktop/views/pages/welcome.vue:
+  about: "詳しく..."
+  gotit: "わかった"
   signin: "ログイン"
   signup: "新規登録"
   signin-button: "やってる"
@@ -714,7 +722,6 @@ desktop/views/widgets/polls.vue:
 desktop/views/widgets/post-form.vue:
   title: "投稿"
   note: "投稿"
-  placeholder: "いまどうしてる？"
 
 desktop/views/widgets/profile.vue:
   update-banner: "クリックでバナー編集"
@@ -813,9 +820,8 @@ mobile/views/components/post-form.vue:
   submit: "投稿"
   reply: "返信"
   renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
   reply-placeholder: "この投稿への返信..."
-  note-placeholder: "いまどうしてる？"
   cw-placeholder: "内容への注釈 (オプション)"
   location-alert: "お使いの端末は位置情報に対応していません"
   error: "エラー"
@@ -832,11 +838,16 @@ mobile/views/components/timeline.vue:
   load-more: "もっと"
 
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
   notifications: "通知"
   messaging: "メッセージ"
   search: "検索"
   drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
   settings: "設定"
   about: "Misskeyについて"
 
@@ -850,8 +861,16 @@ mobile/views/components/users-list.vue:
   known: "知り合い"
   load-more: "もっと"
 
+mobile/views/pages/favorites.vue:
+  title: "お気に入り"
+
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
+
 mobile/views/pages/drive.vue:
   drive: "ドライブ"
+  more: "もっと見る"
 
 mobile/views/pages/followers.vue:
   followers-of: "{}のフォロワー"

locales/ko.yml

@@ -3,7 +3,9 @@ meta:
   lang: "日本語"
   divider: ""
 common:
-  misskey: "Misskeyで皆と共有しよう。"
+  misskey: "A planet of fediverse"
+  about-title: "A ⭐ of fediverse."
+  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
   time:
     unknown: "なぞのじかん"
     future: "未来"
@@ -33,12 +35,20 @@ common:
     angry: "おこ"
     confused: "こまこまのこまり"
     pudding: "Pudding"
+  note-placeholders:
+    a: "今どうしてる？"
+    b: "何かありましたか？"
+    c: "何をお考えですか？"
+    d: "言いたいことは？"
+    e: "ここに書いてください"
+    f: "あなたが書くのを待っています..."
   delete: "削除"
   loading: "読み込み中"
   ok: "わかった"
   update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   widgets:
+    analog-clock: "アナログ時計"
     profile: "プロフィール"
     calendar: "カレンダー"
     timemachine: "カレンダー(タイムマシン)"
@@ -317,15 +327,14 @@ desktop/views/components/note-detail.vue:
   location: "位置情報"
   renote: "Renote"
   add-reaction: "リアクション"
-desktop/views/components/note-detail.sub.vue:
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
 desktop/views/components/notes.note.vue:
   reposted-by: "{}がRenote"
   reply: "返信"
   renote: "Renote"
   add-reaction: "リアクション"
   detail: "詳細"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
 desktop/views/components/notes.vue:
   error: "読み込みに失敗しました。"
   retry: "リトライ"
@@ -333,10 +342,9 @@ desktop/views/components/notifications.vue:
   more: "もっと見る"
   empty: "ありません！"
 desktop/views/components/post-form.vue:
-  note-placeholder: "いまどうしてる？"
   reply-placeholder: "この投稿への返信..."
   quote-placeholder: "この投稿を引用..."
-  note: "投稿"
+  submit: "投稿"
   reply: "返信"
   renote: "Renote"
   posted: "投稿しました！"
@@ -537,6 +545,8 @@ desktop/views/components/window.vue:
   popout: "ポップアウト"
   close: "閉じる"
 desktop/views/pages/welcome.vue:
+  about: "詳しく..."
+  gotit: "わかった"
   signin: "ログイン"
   signup: "新規登録"
   signin-button: "やってる"
@@ -603,7 +613,6 @@ desktop/views/widgets/polls.vue:
 desktop/views/widgets/post-form.vue:
   title: "投稿"
   note: "投稿"
-  placeholder: "いまどうしてる？"
 desktop/views/widgets/profile.vue:
   update-banner: "クリックでバナー編集"
   update-avatar: "クリックでアバター編集"
@@ -685,9 +694,8 @@ mobile/views/components/post-form.vue:
   submit: "投稿"
   reply: "返信"
   renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
   reply-placeholder: "この投稿への返信..."
-  note-placeholder: "いまどうしてる？"
   cw-placeholder: "内容への注釈 (オプション)"
   location-alert: "お使いの端末は位置情報に対応していません"
   error: "エラー"
@@ -701,11 +709,16 @@ mobile/views/components/timeline.vue:
   empty: "投稿がありません"
   load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
   notifications: "通知"
   messaging: "メッセージ"
   search: "検索"
   drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
   settings: "設定"
   about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
@@ -716,8 +729,14 @@ mobile/views/components/users-list.vue:
   all: "すべて"
   known: "知り合い"
   load-more: "もっと"
+mobile/views/pages/favorites.vue:
+  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
   drive: "ドライブ"
+  more: "もっと見る"
 mobile/views/pages/followers.vue:
   followers-of: "{}のフォロワー"
 mobile/views/pages/following.vue:

locales/pl.yml

@@ -3,7 +3,9 @@ meta:
   lang: "język polski"
   divider: ""
 common:
-  misskey: "Dziel się zawartością z innymi korzystając z Misskey."
+  misskey: "A planet of fediverse"
+  about-title: "A ⭐ of fediverse."
+  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
   time:
     unknown: "nieznany"
     future: "w przyszłości"
@@ -33,12 +35,20 @@ common:
     angry: "Wściekły"
     confused: "Zmieszany"
     pudding: "Pudding"
+  note-placeholders:
+    a: "今どうしてる？"
+    b: "何かありましたか？"
+    c: "何をお考えですか？"
+    d: "言いたいことは？"
+    e: "ここに書いてください"
+    f: "あなたが書くのを待っています..."
   delete: "Usuń"
   loading: "Ładowanie"
   ok: "OK"
   update-available: "Nowa wersja Misskey jest dostępna ({newer}, obecna to {current}). Odśwież stronę, aby zastosować aktualizację."
   my-token-regenerated: "Twój token został wygenerowany. Zostaniesz wylogowany."
   widgets:
+    analog-clock: "アナログ時計"
     profile: "Profil"
     calendar: "Kalendarz"
     timemachine: "Kalendarz (wehikuł czasu)"
@@ -113,8 +123,8 @@ common/views/components/nav.vue:
 common/views/components/note-menu.vue:
   favorite: "Dodaj do ulubionych"
   pin: "Przypnij do profilu"
-  delete: "削除"
-  delete-confirm: "この投稿を削除しますか？"
+  delete: "Usuń"
+  delete-confirm: "Czy na pewno chcesz usunąć ten wpis?"
   remote: "Pokaż oryginał"
 common/views/components/poll.vue:
   vote-to: "Zagłosuj na '{}'"
@@ -311,21 +321,20 @@ desktop/views/components/messaging-window.vue:
   title: "Wiadomości"
 desktop/views/components/note-detail.vue:
   more: "Załaduj więcej konwersacji"
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
+  private: "ten wpis jest prywatny"
+  deleted: "ten wpis został usunięty"
   reposted-by: "Udostępniono przez {}"
   location: "Informacje o lokalizacji"
   renote: "Udostępnienie"
   add-reaction: "Dodaj reakcję"
-desktop/views/components/note-detail.sub.vue:
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
 desktop/views/components/notes.note.vue:
   reposted-by: "Udostępniono przez {}"
   reply: "Odpowiedz"
   renote: "Udostępnij"
   add-reaction: "Dodaj reakcję"
   detail: "Pokaż szczegóły"
+  private: "ten wpis jest prywatny"
+  deleted: "ten wpis został usunięty"
 desktop/views/components/notes.vue:
   error: "Ładowanie nie powiodło się."
   retry: "Spróbuj ponownie"
@@ -333,10 +342,9 @@ desktop/views/components/notifications.vue:
   more: "Więcej"
   empty: "Brak powiadomień"
 desktop/views/components/post-form.vue:
-  note-placeholder: "Co się dzieje?"
   reply-placeholder: "Odpowiedz na ten wpis…"
   quote-placeholder: "Zacytuj ten wpis…"
-  note: "Wyślij"
+  submit: "投稿"
   reply: "Odpowiedz"
   renote: "Udostępnienie"
   posted: "Opublikowano!"
@@ -442,7 +450,7 @@ desktop/views/components/settings.vue:
   experimental-desc: "Aktywowanie eksperymentalnych funkcji może spowodować niestabilność Misskey. Opcja ta jest przechowywana w przeglądarce."
   tools: "Narzędzia"
   task-manager: "Menedżer zadań"
-  third-parties: "サードパーティ"
+  third-parties: "Autorzy trzeci"
 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…"
@@ -490,9 +498,9 @@ desktop/views/components/settings.profile.vue:
   is-bot: "To konto jest prowadzone przez bota"
   is-cat: "To konto jest prowadzone przez kota"
 desktop/views/components/sub-note-content.vue:
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
-  media-count: "{}つのメディア"
+  private: "ten wpis jest prywatny"
+  deleted: "ten wpis został usunięty"
+  media-count: "{}zawartości multimedialnej"
   poll: "Ankiety"
 desktop/views/components/taskmanager.vue:
   title: "Menedżer zadań"
@@ -537,6 +545,8 @@ desktop/views/components/window.vue:
   popout: "Pop-out"
   close: "Zamknij"
 desktop/views/pages/welcome.vue:
+  about: "詳しく..."
+  gotit: "わかった"
   signin: "Zaloguj się"
   signup: "Zarejestruj się"
   signin-button: "Zaloguj się"
@@ -603,7 +613,6 @@ desktop/views/widgets/polls.vue:
 desktop/views/widgets/post-form.vue:
   title: "Wpis"
   note: "Wpis"
-  placeholder: "Co się dzieje?"
 desktop/views/widgets/profile.vue:
   update-banner: "Naciśnij, aby zmienić baner"
   update-avatar: "Naciśnij, aby zmienić awatar"
@@ -625,12 +634,12 @@ mobile/views/components/drive.vue:
   nothing-in-drive: "Pusto"
   folder-is-empty: "Ten katalog jest pusty"
   prompt: "Co chcesz zrobić? (wprowadź odpowiednią cyfrę): <1 → Wysłać plik | 2 → Wysłać plik z adresu URL | 3 → Utworzyć katalog | 4 → Zmienić nazwę tego katalogu | 5 → Przenieść ten katalog | 6 → Usunąć ten katalog>"
-  deletion-alert: "ごめんなさい！フォルダの削除は未実装です...。"
+  deletion-alert: "Przepraszamy. Usuwanie katalogów nie zostało jeszcze zaimplementowane."
   folder-name: "Nazwa katalogu"
-  root-rename-alert: "現在いる場所はルートで、フォルダではないため名前の変更はできません。名前を変更したいフォルダに移動してからやってください。"
-  root-move-alert: "現在いる場所はルートで、フォルダではないため移動はできません。移動したいフォルダに移動してからやってください。"
+  root-rename-alert: "Nie można zmienić nazwy katalogu głównego. Przejdź do katalogu, którego nazwę chcesz zmienić."
+  root-move-alert: "Nie można przenieść tego katalogu, ponieważ jest on katalogiem głównym. Przejdź do katalogu, który chcesz przenieść."
   url-prompt: "Adres URL pliku, który chcesz wysłać"
-  uploading: "アップロードをリクエストしました。アップロードが完了するまで時間がかかる場合があります。"
+  uploading: "Rozpoczęto wysyłanie. Może to trochę potrwać."
 mobile/views/components/drive-file-detail.vue:
   rename: "Zmień nazwę"
 mobile/views/components/drive-file-chooser.vue:
@@ -656,15 +665,15 @@ mobile/views/components/note.vue:
   reposted-by: "Udostępniono przez {}"
   more: "Rozwiń"
   less: "Zwiń"
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
+  private: "ten wpis jest prywatny"
+  deleted: "ten wpis został usunięty"
   location: "Informacje o lokalizacji"
 mobile/views/components/note-detail.vue:
   reply: "Odpowiedz"
   reaction: "Reakcja"
   reposted-by: "Udostępniono przez {}"
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
+  private: "ten wpis jest prywatny"
+  deleted: "ten wpis został usunięty"
   location: "Informacje o lokalizacji"
 mobile/views/components/note-preview.vue:
   admin: "admin"
@@ -685,27 +694,31 @@ mobile/views/components/post-form.vue:
   submit: "Wyślij"
   reply: "Odpowiedz"
   renote: "Udostępnij"
-  renote-placeholder: "Zacytuj wpis… (nieobowiązkowe)"
+  quote-placeholder: "この投稿を引用... (オプション)"
   reply-placeholder: "Odpowiedź na ten wpis…"
-  note-placeholder: "Co się dzieje?"
-  cw-placeholder: "内容への注釈 (オプション)"
-  location-alert: "お使いの端末は位置情報に対応していません"
+  cw-placeholder: "Treść ostrzeżenia (opcjonalnie)"
+  location-alert: "Twoje urządzenie nie pozwala na przekazywanie informacji o lokalizacji"
   error: "Błąd"
   username-prompt: "Wprowadź nazwę użytkownika"
 mobile/views/components/sub-note-content.vue:
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
-  media-count: "{}つのメディア"
+  private: "ten wpis jest prywatny"
+  deleted: "ten wpis został usunięty"
+  media-count: "{}zawartości multimedialnej"
   poll: "Ankieta"
 mobile/views/components/timeline.vue:
   empty: "Brak wpisów"
   load-more: "Więcej"
 mobile/views/components/ui.nav.vue:
-  home: "Strona główna"
+  timeline: "タイムライン"
   notifications: "Powiadomienia"
   messaging: "Wiadomości"
   search: "Szukaj"
   drive: "Dysk"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
   settings: "Ustawienia"
   about: "O Misskey"
 mobile/views/components/user-timeline.vue:
@@ -716,8 +729,14 @@ mobile/views/components/users-list.vue:
   all: "Wszyscy"
   known: "Znasz"
   load-more: "Więcej"
+mobile/views/pages/favorites.vue:
+  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
   drive: "Dysk"
+  more: "もっと見る"
 mobile/views/pages/followers.vue:
   followers-of: "Śledzący {}"
 mobile/views/pages/following.vue:

locales/pt.yml

@@ -3,7 +3,9 @@ meta:
   lang: "Português"
   divider: ""
 common:
-  misskey: "Misskeyで皆と共有しよう。"
+  misskey: "A planet of fediverse"
+  about-title: "A ⭐ of fediverse."
+  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
   time:
     unknown: "なぞのじかん"
     future: "未来"
@@ -33,12 +35,20 @@ common:
     angry: "おこ"
     confused: "こまこまのこまり"
     pudding: "Pudding"
+  note-placeholders:
+    a: "今どうしてる？"
+    b: "何かありましたか？"
+    c: "何をお考えですか？"
+    d: "言いたいことは？"
+    e: "ここに書いてください"
+    f: "あなたが書くのを待っています..."
   delete: "削除"
   loading: "読み込み中"
   ok: "わかった"
   update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   widgets:
+    analog-clock: "アナログ時計"
     profile: "プロフィール"
     calendar: "カレンダー"
     timemachine: "カレンダー(タイムマシン)"
@@ -317,15 +327,14 @@ desktop/views/components/note-detail.vue:
   location: "位置情報"
   renote: "Renote"
   add-reaction: "リアクション"
-desktop/views/components/note-detail.sub.vue:
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
 desktop/views/components/notes.note.vue:
   reposted-by: "{}がRenote"
   reply: "返信"
   renote: "Renote"
   add-reaction: "リアクション"
   detail: "詳細"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
 desktop/views/components/notes.vue:
   error: "読み込みに失敗しました。"
   retry: "リトライ"
@@ -333,10 +342,9 @@ desktop/views/components/notifications.vue:
   more: "もっと見る"
   empty: "ありません！"
 desktop/views/components/post-form.vue:
-  note-placeholder: "いまどうしてる？"
   reply-placeholder: "この投稿への返信..."
   quote-placeholder: "この投稿を引用..."
-  note: "投稿"
+  submit: "投稿"
   reply: "返信"
   renote: "Renote"
   posted: "投稿しました！"
@@ -537,6 +545,8 @@ desktop/views/components/window.vue:
   popout: "ポップアウト"
   close: "閉じる"
 desktop/views/pages/welcome.vue:
+  about: "詳しく..."
+  gotit: "わかった"
   signin: "ログイン"
   signup: "新規登録"
   signin-button: "やってる"
@@ -603,7 +613,6 @@ desktop/views/widgets/polls.vue:
 desktop/views/widgets/post-form.vue:
   title: "投稿"
   note: "投稿"
-  placeholder: "いまどうしてる？"
 desktop/views/widgets/profile.vue:
   update-banner: "クリックでバナー編集"
   update-avatar: "クリックでアバター編集"
@@ -685,9 +694,8 @@ mobile/views/components/post-form.vue:
   submit: "投稿"
   reply: "返信"
   renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
   reply-placeholder: "この投稿への返信..."
-  note-placeholder: "いまどうしてる？"
   cw-placeholder: "内容への注釈 (オプション)"
   location-alert: "お使いの端末は位置情報に対応していません"
   error: "エラー"
@@ -701,11 +709,16 @@ mobile/views/components/timeline.vue:
   empty: "投稿がありません"
   load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
   notifications: "通知"
   messaging: "メッセージ"
   search: "検索"
   drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
   settings: "設定"
   about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
@@ -716,8 +729,14 @@ mobile/views/components/users-list.vue:
   all: "すべて"
   known: "知り合い"
   load-more: "もっと"
+mobile/views/pages/favorites.vue:
+  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
   drive: "ドライブ"
+  more: "もっと見る"
 mobile/views/pages/followers.vue:
   followers-of: "{}のフォロワー"
 mobile/views/pages/following.vue:

locales/ru.yml

@@ -3,7 +3,9 @@ meta:
   lang: "Русский язык"
   divider: ""
 common:
-  misskey: "Misskeyで皆と共有しよう。"
+  misskey: "A planet of fediverse"
+  about-title: "A ⭐ of fediverse."
+  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
   time:
     unknown: "なぞのじかん"
     future: "未来"
@@ -33,12 +35,20 @@ common:
     angry: "おこ"
     confused: "こまこまのこまり"
     pudding: "Pudding"
+  note-placeholders:
+    a: "今どうしてる？"
+    b: "何かありましたか？"
+    c: "何をお考えですか？"
+    d: "言いたいことは？"
+    e: "ここに書いてください"
+    f: "あなたが書くのを待っています..."
   delete: "削除"
   loading: "読み込み中"
   ok: "わかった"
   update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   widgets:
+    analog-clock: "アナログ時計"
     profile: "プロフィール"
     calendar: "カレンダー"
     timemachine: "カレンダー(タイムマシン)"
@@ -317,15 +327,14 @@ desktop/views/components/note-detail.vue:
   location: "位置情報"
   renote: "Renote"
   add-reaction: "リアクション"
-desktop/views/components/note-detail.sub.vue:
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
 desktop/views/components/notes.note.vue:
   reposted-by: "{}がRenote"
   reply: "返信"
   renote: "Renote"
   add-reaction: "リアクション"
   detail: "詳細"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
 desktop/views/components/notes.vue:
   error: "読み込みに失敗しました。"
   retry: "リトライ"
@@ -333,10 +342,9 @@ desktop/views/components/notifications.vue:
   more: "もっと見る"
   empty: "ありません！"
 desktop/views/components/post-form.vue:
-  note-placeholder: "いまどうしてる？"
   reply-placeholder: "この投稿への返信..."
   quote-placeholder: "この投稿を引用..."
-  note: "投稿"
+  submit: "投稿"
   reply: "返信"
   renote: "Renote"
   posted: "投稿しました！"
@@ -537,6 +545,8 @@ desktop/views/components/window.vue:
   popout: "ポップアウト"
   close: "閉じる"
 desktop/views/pages/welcome.vue:
+  about: "詳しく..."
+  gotit: "わかった"
   signin: "ログイン"
   signup: "新規登録"
   signin-button: "やってる"
@@ -603,7 +613,6 @@ desktop/views/widgets/polls.vue:
 desktop/views/widgets/post-form.vue:
   title: "投稿"
   note: "投稿"
-  placeholder: "いまどうしてる？"
 desktop/views/widgets/profile.vue:
   update-banner: "クリックでバナー編集"
   update-avatar: "クリックでアバター編集"
@@ -685,9 +694,8 @@ mobile/views/components/post-form.vue:
   submit: "投稿"
   reply: "返信"
   renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
   reply-placeholder: "この投稿への返信..."
-  note-placeholder: "いまどうしてる？"
   cw-placeholder: "内容への注釈 (オプション)"
   location-alert: "お使いの端末は位置情報に対応していません"
   error: "エラー"
@@ -701,11 +709,16 @@ mobile/views/components/timeline.vue:
   empty: "投稿がありません"
   load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
   notifications: "通知"
   messaging: "メッセージ"
   search: "検索"
   drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
   settings: "設定"
   about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
@@ -716,8 +729,14 @@ mobile/views/components/users-list.vue:
   all: "すべて"
   known: "知り合い"
   load-more: "もっと"
+mobile/views/pages/favorites.vue:
+  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
   drive: "ドライブ"
+  more: "もっと見る"
 mobile/views/pages/followers.vue:
   followers-of: "{}のフォロワー"
 mobile/views/pages/following.vue:

locales/zh.yml

@@ -3,7 +3,9 @@ meta:
   lang: "中文(简体)"
   divider: ""
 common:
-  misskey: "Misskeyで皆と共有しよう。"
+  misskey: "A planet of fediverse"
+  about-title: "A ⭐ of fediverse."
+  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
   time:
     unknown: "なぞのじかん"
     future: "未来"
@@ -33,12 +35,20 @@ common:
     angry: "おこ"
     confused: "こまこまのこまり"
     pudding: "Pudding"
+  note-placeholders:
+    a: "今どうしてる？"
+    b: "何かありましたか？"
+    c: "何をお考えですか？"
+    d: "言いたいことは？"
+    e: "ここに書いてください"
+    f: "あなたが書くのを待っています..."
   delete: "削除"
   loading: "読み込み中"
   ok: "わかった"
   update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   widgets:
+    analog-clock: "アナログ時計"
     profile: "プロフィール"
     calendar: "カレンダー"
     timemachine: "カレンダー(タイムマシン)"
@@ -317,15 +327,14 @@ desktop/views/components/note-detail.vue:
   location: "位置情報"
   renote: "Renote"
   add-reaction: "リアクション"
-desktop/views/components/note-detail.sub.vue:
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
 desktop/views/components/notes.note.vue:
   reposted-by: "{}がRenote"
   reply: "返信"
   renote: "Renote"
   add-reaction: "リアクション"
   detail: "詳細"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
 desktop/views/components/notes.vue:
   error: "読み込みに失敗しました。"
   retry: "リトライ"
@@ -333,10 +342,9 @@ desktop/views/components/notifications.vue:
   more: "もっと見る"
   empty: "ありません！"
 desktop/views/components/post-form.vue:
-  note-placeholder: "いまどうしてる？"
   reply-placeholder: "この投稿への返信..."
   quote-placeholder: "この投稿を引用..."
-  note: "投稿"
+  submit: "投稿"
   reply: "返信"
   renote: "Renote"
   posted: "投稿しました！"
@@ -537,6 +545,8 @@ desktop/views/components/window.vue:
   popout: "ポップアウト"
   close: "閉じる"
 desktop/views/pages/welcome.vue:
+  about: "詳しく..."
+  gotit: "わかった"
   signin: "ログイン"
   signup: "新規登録"
   signin-button: "やってる"
@@ -603,7 +613,6 @@ desktop/views/widgets/polls.vue:
 desktop/views/widgets/post-form.vue:
   title: "投稿"
   note: "投稿"
-  placeholder: "いまどうしてる？"
 desktop/views/widgets/profile.vue:
   update-banner: "クリックでバナー編集"
   update-avatar: "クリックでアバター編集"
@@ -685,9 +694,8 @@ mobile/views/components/post-form.vue:
   submit: "投稿"
   reply: "返信"
   renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
   reply-placeholder: "この投稿への返信..."
-  note-placeholder: "いまどうしてる？"
   cw-placeholder: "内容への注釈 (オプション)"
   location-alert: "お使いの端末は位置情報に対応していません"
   error: "エラー"
@@ -701,11 +709,16 @@ mobile/views/components/timeline.vue:
   empty: "投稿がありません"
   load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
   notifications: "通知"
   messaging: "メッセージ"
   search: "検索"
   drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
   settings: "設定"
   about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
@@ -716,8 +729,14 @@ mobile/views/components/users-list.vue:
   all: "すべて"
   known: "知り合い"
   load-more: "もっと"
+mobile/views/pages/favorites.vue:
+  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
   drive: "ドライブ"
+  more: "もっと見る"
 mobile/views/pages/followers.vue:
   followers-of: "{}のフォロワー"
 mobile/views/pages/following.vue:

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "2.20.1",
-	"clientVersion": "1.0.5871",
+	"version": "2.24.2",
+	"clientVersion": "1.0.6035",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,

src/client/app/auth/script.ts

@@ -20,6 +20,7 @@ init(launch => {
 	// Init router
 	const router = new VueRouter({
 		mode: 'history',
+		base: '/auth/',
 		routes: [
 			{ path: '/:token', component: Index },
 		]

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

@@ -51,7 +51,7 @@ export default Vue.extend({
 		}
 	},
 	mounted() {
-		if (!this.$root.$data.$store.getters.isSignedIn) return;
+		if (!this.$store.getters.isSignedIn) return;
 
 		// Fetch session
 		(this as any).api('auth/session/show', {
@@ -62,7 +62,7 @@ export default Vue.extend({
 
 			// 既に連携していた場合
 			if (this.session.app.isAuthorized) {
-				this.$root.$data.os.api('auth/accept', {
+				(this as any).api('auth/accept', {
 					token: this.session.token
 				}).then(() => {
 					this.accepted();
@@ -72,6 +72,7 @@ export default Vue.extend({
 			}
 		}).catch(error => {
 			this.state = 'fetch-session-error';
+			this.fetching = false;
 		});
 	},
 	methods: {

src/client/app/base.pug

@@ -19,7 +19,7 @@ html
 				| Misskey
 
 		block desc
-			meta(name='description' content='A SNS')
+			meta(name='description' content='A planet of fediverse')
 
 		block meta
 

src/client/app/boot.js

@@ -32,9 +32,9 @@
 	//#region Detect app name
 	let app = null;
 
-	if (url.pathname == '/docs') app = 'docs';
-	if (url.pathname == '/dev') app = 'dev';
-	if (url.pathname == '/auth') app = 'auth';
+	if (url.pathname == '/docs' || url.pathname.startsWith('/docs/')) app = 'docs';
+	if (url.pathname == '/dev' || url.pathname.startsWith('/dev/')) app = 'dev';
+	if (url.pathname == '/auth' || url.pathname.startsWith('/auth/')) app = 'auth';
 	//#endregion
 
 	//#region Detect the user language

src/client/app/common/scripts/streaming/home.ts

@@ -28,6 +28,30 @@ export class HomeStream extends Stream {
 			os.store.dispatch('mergeMe', i);
 		});
 
+		this.on('read_all_notifications', () => {
+			os.store.dispatch('mergeMe', {
+				hasUnreadNotification: false
+			});
+		});
+
+		this.on('unread_notification', () => {
+			os.store.dispatch('mergeMe', {
+				hasUnreadNotification: true
+			});
+		});
+
+		this.on('read_all_messaging_messages', () => {
+			os.store.dispatch('mergeMe', {
+				hasUnreadMessagingMessage: false
+			});
+		});
+
+		this.on('unread_messaging_message', () => {
+			os.store.dispatch('mergeMe', {
+				hasUnreadMessagingMessage: true
+			});
+		});
+
 		this.on('clientSettingUpdated', x => {
 			os.store.commit('settings/set', {
 				key: x.key,

src/client/app/common/views/components/analog-clock.vue

@@ -0,0 +1,127 @@
+<template>
+<svg class="mk-analog-clock" viewBox="0 0 10 10" preserveAspectRatio="none">
+	<circle v-for="angle, i in graduations"
+		:cx="5 + (Math.sin(angle) * (5 - graduationsPadding))"
+		:cy="5 - (Math.cos(angle) * (5 - graduationsPadding))"
+		:r="i % 5 == 0 ? 0.125 : 0.05"
+		:fill="i % 5 == 0 ? majorGraduationColor : minorGraduationColor"/>
+
+	<line
+		:x1="5 - (Math.sin(sAngle) * (sHandLengthRatio * handsTailLength))"
+		:y1="5 + (Math.cos(sAngle) * (sHandLengthRatio * handsTailLength))"
+		:x2="5 + (Math.sin(sAngle) * ((sHandLengthRatio * 5) - handsPadding))"
+		:y2="5 - (Math.cos(sAngle) * ((sHandLengthRatio * 5) - handsPadding))"
+		:stroke="sHandColor"
+		stroke-width="0.05"/>
+	<line
+		:x1="5 - (Math.sin(mAngle) * (mHandLengthRatio * handsTailLength))"
+		:y1="5 + (Math.cos(mAngle) * (mHandLengthRatio * handsTailLength))"
+		:x2="5 + (Math.sin(mAngle) * ((mHandLengthRatio * 5) - handsPadding))"
+		:y2="5 - (Math.cos(mAngle) * ((mHandLengthRatio * 5) - handsPadding))"
+		:stroke="mHandColor"
+		stroke-width="0.1"/>
+	<line
+		:x1="5 - (Math.sin(hAngle) * (hHandLengthRatio * handsTailLength))"
+		:y1="5 + (Math.cos(hAngle) * (hHandLengthRatio * handsTailLength))"
+		:x2="5 + (Math.sin(hAngle) * ((hHandLengthRatio * 5) - handsPadding))"
+		:y2="5 - (Math.cos(hAngle) * ((hHandLengthRatio * 5) - handsPadding))"
+		:stroke="hHandColor"
+		stroke-width="0.1"/>
+</svg>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import { themeColor } from '../../../config';
+
+export default Vue.extend({
+	props: {
+		dark: {
+			type: Boolean,
+			default: false
+		}
+	},
+
+	data() {
+		return {
+			now: new Date(),
+			clock: null,
+
+			graduationsPadding: 0.5,
+			handsPadding: 1,
+			handsTailLength: 0.7,
+			hHandLengthRatio: 0.75,
+			mHandLengthRatio: 1,
+			sHandLengthRatio: 1
+		};
+	},
+
+	computed: {
+		majorGraduationColor(): string {
+			return this.dark ? 'rgba(255, 255, 255, 0.3)' : 'rgba(0, 0, 0, 0.3)';
+		},
+		minorGraduationColor(): string {
+			return this.dark ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)';
+		},
+
+		sHandColor(): string {
+			return this.dark ? 'rgba(255, 255, 255, 0.5)' : 'rgba(0, 0, 0, 0.3)';
+		},
+		mHandColor(): string {
+			return this.dark ? '#fff' : '#777';
+		},
+		hHandColor(): string {
+			return themeColor;
+		},
+
+		s(): number {
+			return this.now.getSeconds();
+		},
+		m(): number {
+			return this.now.getMinutes();
+		},
+		h(): number {
+			return this.now.getHours();
+		},
+
+		hAngle(): number {
+			return Math.PI * (this.h % 12 + this.m / 60) / 6;
+		},
+		mAngle(): number {
+			return Math.PI * (this.m + this.s / 60) / 30;
+		},
+		sAngle(): number {
+			return Math.PI * this.s / 30;
+		},
+
+		graduations(): any {
+			const angles = [];
+			for (let i = 0; i < 60; i++) {
+				const angle = Math.PI * i / 30;
+				angles.push(angle);
+			}
+
+			return angles;
+		}
+	},
+
+	mounted() {
+		this.clock = setInterval(this.tick, 1000);
+	},
+
+	beforeDestroy() {
+		clearInterval(this.clock);
+	},
+
+	methods: {
+		tick() {
+			this.now = new Date();
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.mk-analog-clock
+	display block
+</style>

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

@@ -13,7 +13,7 @@
 
 .a
 	display block
-	position absolute
+	position fixed
 	top 0
 	right 0
 

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

@@ -1,5 +1,6 @@
 import Vue from 'vue';
 
+import analogClock from './analog-clock.vue';
 import signin from './signin.vue';
 import signup from './signup.vue';
 import forkit from './forkit.vue';
@@ -27,6 +28,7 @@ import Switch from './switch.vue';
 import Othello from './othello.vue';
 import welcomeTimeline from './welcome-timeline.vue';
 
+Vue.component('mk-analog-clock', analogClock);
 Vue.component('mk-signin', signin);
 Vue.component('mk-signup', signup);
 Vue.component('mk-forkit', forkit);

src/client/app/common/views/components/media-list.vue

@@ -1,9 +1,11 @@
 <template>
-<div class="mk-media-list" :data-count="mediaList.length">
-	<template v-for="media in mediaList">
-		<mk-media-video :video="media" :key="media.id" v-if="media.type.startsWith('video')" :inline-playable="mediaList.length === 1"/>
-		<mk-media-image :image="media" :key="media.id" v-else :raw="raw"/>
-	</template>
+<div class="mk-media-list">
+	<div :data-count="mediaList.length" ref="grid">
+		<template v-for="media in mediaList">
+			<mk-media-video :video="media" :key="media.id" v-if="media.type.startsWith('video')" :inline-playable="mediaList.length === 1"/>
+			<mk-media-image :image="media" :key="media.id" v-else :raw="raw"/>
+		</template>
+	</div>
 </div>
 </template>
 
@@ -18,47 +20,60 @@ export default Vue.extend({
 		raw: {
 			default: false
 		}
+	},
+	mounted() {
+		// for Safari bug
+		this.$refs.grid.style.height = this.$refs.grid.clientHeight ? `${this.$refs.grid.clientHeight}px` : '128px';
 	}
 });
 </script>
 
 <style lang="stylus" scoped>
 .mk-media-list
-	display grid
-	grid-gap 4px
-	height 256px
+	width 100%
 
-	@media (max-width 500px)
-		height 192px
+	&:before
+		content ''
+		display block
+		padding-top 56.25% // 16:9
+
+	> div
+		position absolute
+		top 0
+		right 0
+		bottom 0
+		left 0
+		display grid
+		grid-gap 4px
+
+		&[data-count="1"]
+			grid-template-rows 1fr
+		&[data-count="2"]
+			grid-template-columns 1fr 1fr
+			grid-template-rows 1fr
+		&[data-count="3"]
+			grid-template-columns 1fr 0.5fr
+			grid-template-rows 1fr 1fr
+			:nth-child(1)
+				grid-row 1 / 3
+			:nth-child(3)
+				grid-column 2 / 3
+				grid-row 2 / 3
+		&[data-count="4"]
+			grid-template-columns 1fr 1fr
+			grid-template-rows 1fr 1fr
 
-	&[data-count="1"]
-		grid-template-rows 1fr
-	&[data-count="2"]
-		grid-template-columns 1fr 1fr
-		grid-template-rows 1fr
-	&[data-count="3"]
-		grid-template-columns 1fr 0.5fr
-		grid-template-rows 1fr 1fr
 		:nth-child(1)
-			grid-row 1 / 3
-		:nth-child(3)
+			grid-column 1 / 2
+			grid-row 1 / 2
+		:nth-child(2)
 			grid-column 2 / 3
-			grid-row 2/3
-	&[data-count="4"]
-		grid-template-columns 1fr 1fr
-		grid-template-rows 1fr 1fr
-
-	:nth-child(1)
-		grid-column 1 / 2
-		grid-row 1 / 2
-	:nth-child(2)
-		grid-column 2 / 3
-		grid-row 1 / 2
-	:nth-child(3)
-		grid-column 1 / 2
-		grid-row 2 / 3
-	:nth-child(4)
-		grid-column 2 / 3
-		grid-row 2 / 3
+			grid-row 1 / 2
+		:nth-child(3)
+			grid-column 1 / 2
+			grid-row 2 / 3
+		:nth-child(4)
+			grid-column 2 / 3
+			grid-row 2 / 3
 
 </style>

src/client/app/common/views/widgets/analog-clock.vue

@@ -0,0 +1,41 @@
+<template>
+<div class="mkw-analog-clock">
+	<mk-widget-container :naked="props.naked" :show-header="false">
+		<div class="mkw-analog-clock--body">
+			<mk-analog-clock :dark="$store.state.device.darkmode"/>
+		</div>
+	</mk-widget-container>
+</div>
+</template>
+
+<script lang="ts">
+import define from '../../../common/define-widget';
+export default define({
+	name: 'analog-clock',
+	props: () => ({
+		naked: false
+	})
+}).extend({
+	methods: {
+		func() {
+			this.props.naked = !this.props.naked;
+			this.save();
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+root(isDark)
+	.mkw-analog-clock--body
+		padding 8px
+
+.mkw-analog-clock[data-darkmode]
+	root(true)
+
+.mkw-analog-clock:not([data-darkmode])
+	root(false)
+
+</style>

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

@@ -1,5 +1,6 @@
 import Vue from 'vue';
 
+import wAnalogClock from './analog-clock.vue';
 import wVersion from './version.vue';
 import wRss from './rss.vue';
 import wServer from './server.vue';
@@ -12,6 +13,7 @@ import wTips from './tips.vue';
 import wDonation from './donation.vue';
 import wNav from './nav.vue';
 
+Vue.component('mkw-analog-clock', wAnalogClock);
 Vue.component('mkw-nav', wNav);
 Vue.component('mkw-calendar', wCalendar);
 Vue.component('mkw-photo-stream', wPhotoStream);

src/client/app/common/views/widgets/memo.vue

@@ -73,6 +73,7 @@ root(isDark)
 			background isDark ? #282c37 : #fff
 			border none
 			border-bottom solid 1px isDark ? #1c2023 : #eee
+			border-radius 0
 
 		> button
 			display block

src/client/app/desktop/style.styl

@@ -6,44 +6,27 @@
 *::input-placeholder
 	color #D8CBC5
 
-*
-	&:focus
-		outline none
-
-	&::scrollbar
-		width 5px
-		background transparent
-
-		&:horizontal
-			height 5px
-
-	&::scrollbar-button
-		width 0
-		height 0
-		background rgba(0, 0, 0, 0.2)
-
-	&::scrollbar-piece
-		background transparent
-
-		&:start
-			background transparent
-
-	&::scrollbar-thumb
-		background rgba(0, 0, 0, 0.2)
-
-		&:hover
-			background rgba(0, 0, 0, 0.4)
-
-		&:active
-			background $theme-color
-
-	&::scrollbar-corner
-		background rgba(0, 0, 0, 0.2)
+*:focus
+	outline none
 
 html
 	height 100%
 	background #f7f7f7
 
+	&, *
+		&::-webkit-scrollbar
+			width 6px
+			height 6px
+
+		&::-webkit-scrollbar-thumb
+			background rgba(0, 0, 0, 0.2)
+
+			&:hover
+				background rgba(0, 0, 0, 0.4)
+
+			&:active
+				background $theme-color
+
 	&[data-darkmode]
 		background #191B22
 
@@ -51,10 +34,6 @@ html
 			&::-webkit-scrollbar-track
 				background-color #282C37
 
-			&::-webkit-scrollbar
-				width 6px
-				height 6px
-
 			&::-webkit-scrollbar-thumb
 				background-color #454954
 

src/client/app/desktop/views/components/analog-clock.vue

@@ -1,108 +0,0 @@
-<template>
-<canvas class="mk-analog-clock" ref="canvas" width="256" height="256"></canvas>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import { themeColor } from '../../../config';
-
-const Vec2 = function(this: any, x, y) {
-	this.x = x;
-	this.y = y;
-};
-
-export default Vue.extend({
-	data() {
-		return {
-			clock: null
-		};
-	},
-	mounted() {
-		this.tick();
-		this.clock = setInterval(this.tick, 1000);
-	},
-	beforeDestroy() {
-		clearInterval(this.clock);
-	},
-	methods: {
-		tick() {
-			const canv = this.$refs.canvas as any;
-
-			const now = new Date();
-			const s = now.getSeconds();
-			const m = now.getMinutes();
-			const h = now.getHours();
-
-			const ctx = canv.getContext('2d');
-			const canvW = canv.width;
-			const canvH = canv.height;
-			ctx.clearRect(0, 0, canvW, canvH);
-
-			{ // 背景
-				const center = Math.min((canvW / 2), (canvH / 2));
-				const lineStart =    center * 0.90;
-				const shortLineEnd = center * 0.87;
-				const longLineEnd =  center * 0.84;
-				for (let i = 0; i < 60; i++) {
-					const angle = Math.PI * i / 30;
-					const uv = new Vec2(Math.sin(angle), -Math.cos(angle));
-					ctx.beginPath();
-					ctx.lineWidth = 1;
-					ctx.moveTo((canvW / 2) + uv.x * lineStart, (canvH / 2) + uv.y * lineStart);
-					if (i % 5 == 0) {
-						ctx.strokeStyle = 'rgba(255, 255, 255, 0.2)';
-						ctx.lineTo((canvW / 2) + uv.x * longLineEnd, (canvH / 2) + uv.y * longLineEnd);
-					} else {
-						ctx.strokeStyle = 'rgba(255, 255, 255, 0.1)';
-						ctx.lineTo((canvW / 2) + uv.x * shortLineEnd, (canvH / 2) + uv.y * shortLineEnd);
-					}
-					ctx.stroke();
-				}
-			}
-
-			{ // 分
-				const angle = Math.PI * (m + s / 60) / 30;
-				const length = Math.min(canvW, canvH) / 2.6;
-				const uv = new Vec2(Math.sin(angle), -Math.cos(angle));
-				ctx.beginPath();
-				ctx.strokeStyle = '#ffffff';
-				ctx.lineWidth = 2;
-				ctx.moveTo(canvW / 2 - uv.x * length / 5, canvH / 2 - uv.y * length / 5);
-				ctx.lineTo(canvW / 2 + uv.x * length,     canvH / 2 + uv.y * length);
-				ctx.stroke();
-			}
-
-			{ // 時
-				const angle = Math.PI * (h % 12 + m / 60) / 6;
-				const length = Math.min(canvW, canvH) / 4;
-				const uv = new Vec2(Math.sin(angle), -Math.cos(angle));
-				ctx.beginPath();
-				ctx.strokeStyle = themeColor;
-				ctx.lineWidth = 2;
-				ctx.moveTo(canvW / 2 - uv.x * length / 5, canvH / 2 - uv.y * length / 5);
-				ctx.lineTo(canvW / 2 + uv.x * length,     canvH / 2 + uv.y * length);
-				ctx.stroke();
-			}
-
-			{ // 秒
-				const angle = Math.PI * s / 30;
-				const length = Math.min(canvW, canvH) / 2.6;
-				const uv = new Vec2(Math.sin(angle), -Math.cos(angle));
-				ctx.beginPath();
-				ctx.strokeStyle = 'rgba(255, 255, 255, 0.5)';
-				ctx.lineWidth = 1;
-				ctx.moveTo(canvW / 2 - uv.x * length / 5, canvH / 2 - uv.y * length / 5);
-				ctx.lineTo(canvW / 2 + uv.x * length,     canvH / 2 + uv.y * length);
-				ctx.stroke();
-			}
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.mk-analog-clock
-	display block
-	width 256px
-	height 256px
-</style>

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

@@ -62,7 +62,7 @@ export default Vue.extend({
 
 		onContextmenu(e) {
 			this.isContextmenuShowing = true;
-			contextmenu(e, [{
+			contextmenu((this as any).os)(e, [{
 				type: 'item',
 				text: '%i18n:@contextmenu.rename%',
 				icon: '%fa:i-cursor%',

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

@@ -52,7 +52,7 @@ export default Vue.extend({
 
 		onContextmenu(e) {
 			this.isContextmenuShowing = true;
-			contextmenu(e, [{
+			contextmenu((this as any).os)(e, [{
 				type: 'item',
 				text: '%i18n:@contextmenu.move-to-this-folder%',
 				icon: '%fa:arrow-right%',

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

@@ -136,7 +136,7 @@ export default Vue.extend({
 	},
 	methods: {
 		onContextmenu(e) {
-			contextmenu(e, [{
+			contextmenu((this as any).os)(e, [{
 				type: 'item',
 				text: '%i18n:@contextmenu.create-folder%',
 				icon: '%fa:R folder%',

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

@@ -7,6 +7,7 @@
 				<p>%i18n:@add-widget%</p>
 				<select v-model="widgetAdderSelected">
 					<option value="profile">%i18n:common.widgets.profile%</option>
+					<option value="analog-clock">%i18n:common.widgets.analog-clock%</option>
 					<option value="calendar">%i18n:common.widgets.calendar%</option>
 					<option value="timemachine">%i18n:common.widgets.timemachine%</option>
 					<option value="activity">%i18n:common.widgets.activity%</option>

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 analogClock from './analog-clock.vue';
 import ellipsisIcon from './ellipsis-icon.vue';
 import mediaImage from './media-image.vue';
 import mediaImageDialog from './media-image-dialog.vue';
@@ -40,7 +39,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-analog-clock', analogClock);
 Vue.component('mk-ellipsis-icon', ellipsisIcon);
 Vue.component('mk-media-image', mediaImage);
 Vue.component('mk-media-image-dialog', mediaImageDialog);

src/client/app/desktop/views/components/note-detail.sub.vue

@@ -1,124 +0,0 @@
-<template>
-<div class="sub" :title="title">
-	<mk-avatar class="avatar" :user="note.user"/>
-	<div class="main">
-		<header>
-			<div class="left">
-				<router-link class="name" :to="note.user | userPage" v-user-preview="note.userId">{{ note.user | userName }}</router-link>
-				<span class="username"><mk-acct :user="note.user"/></span>
-			</div>
-			<div class="right">
-				<router-link class="time" :to="note | notePage">
-					<mk-time :time="note.createdAt"/>
-				</router-link>
-			</div>
-		</header>
-		<div class="body">
-			<div class="text">
-				<span v-if="note.isHidden" style="opacity: 0.5">%i18n:@private%</span>
-				<span v-if="note.deletedAt" style="opacity: 0.5">%i18n:@deleted%</span>
-				<mk-note-html v-if="note.text" :text="note.text" :i="$store.state.i"/>
-			</div>
-			<div class="media" v-if="note.mediaIds.length > 0">
-				<mk-media-list :media-list="note.media"/>
-			</div>
-		</div>
-	</div>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import dateStringify from '../../../common/scripts/date-stringify';
-
-export default Vue.extend({
-	props: ['note'],
-	computed: {
-		title(): string {
-			return dateStringify(this.note.createdAt);
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-root(isDark)
-	margin 0
-	padding 20px 32px
-	background isDark ? #21242d : #fdfdfd
-
-	&:after
-		content ""
-		display block
-		clear both
-
-	&:hover
-		> .main > footer > button
-			color #888
-
-	> .avatar
-		display block
-		float left
-		margin 0 16px 0 0
-		width 44px
-		height 44px
-		border-radius 4px
-
-	> .main
-		float left
-		width calc(100% - 60px)
-
-		> header
-			margin-bottom 4px
-			white-space nowrap
-
-			&:after
-				content ""
-				display block
-				clear both
-
-			> .left
-				float left
-
-				> .name
-					display inline
-					margin 0
-					padding 0
-					color isDark ? #fff : #777
-					font-size 1em
-					font-weight 700
-					text-align left
-					text-decoration none
-
-					&:hover
-						text-decoration underline
-
-				> .username
-					text-align left
-					margin 0 0 0 8px
-					color isDark ? #606984 : #ccc
-
-			> .right
-				float right
-
-				> .time
-					font-size 0.9em
-					color isDark ? #606984 : #c0c0c0
-
-		> .body
-			> .text
-				cursor default
-				display block
-				margin 0
-				padding 0
-				overflow-wrap break-word
-				font-size 1em
-				color isDark ? #959ba7 : #717171
-
-.sub[data-darkmode]
-	root(true)
-
-.sub:not([data-darkmode])
-	root(false)
-
-</style>

src/client/app/desktop/views/components/note-detail.vue

@@ -89,7 +89,7 @@ import MkPostFormWindow from './post-form-window.vue';
 import MkRenoteFormWindow from './renote-form-window.vue';
 import MkNoteMenu from '../../../common/views/components/note-menu.vue';
 import MkReactionPicker from '../../../common/views/components/reaction-picker.vue';
-import XSub from './note-detail.sub.vue';
+import XSub from './notes.note.sub.vue';
 
 export default Vue.extend({
 	components: {
@@ -218,8 +218,6 @@ export default Vue.extend({
 @import '~const.styl'
 
 root(isDark)
-	margin 0 auto
-	padding 0
 	overflow hidden
 	text-align left
 	background isDark ? #282C37 : #fff

src/client/app/desktop/views/components/note-preview.vue

@@ -5,9 +5,18 @@
 		<header>
 			<router-link class="name" :to="note.user | userPage" v-user-preview="note.userId">{{ note.user | userName }}</router-link>
 			<span class="username"><mk-acct :user="note.user"/></span>
-			<router-link class="time" :to="note | notePage">
-				<mk-time :time="note.createdAt"/>
-			</router-link>
+			<div class="info">
+				<span class="mobile" v-if="note.viaMobile">%fa:mobile-alt%</span>
+				<router-link class="created-at" :to="note | notePage">
+					<mk-time :time="note.createdAt"/>
+				</router-link>
+				<span class="visibility" v-if="note.visibility != 'public'">
+					<template v-if="note.visibility == 'home'">%fa:home%</template>
+					<template v-if="note.visibility == 'followers'">%fa:unlock%</template>
+					<template v-if="note.visibility == 'specified'">%fa:envelope%</template>
+					<template v-if="note.visibility == 'private'">%fa:lock%</template>
+				</span>
+			</div>
 		</header>
 		<div class="body">
 			<mk-sub-note-content class="text" :note="note"/>
@@ -32,24 +41,20 @@ export default Vue.extend({
 
 <style lang="stylus" scoped>
 root(isDark)
+	display flex
 	font-size 0.9em
 
-	&:after
-		content ""
-		display block
-		clear both
-
 	> .avatar
+		flex-shrink 0
 		display block
-		float left
 		margin 0 12px 0 0
 		width 48px
 		height 48px
 		border-radius 8px
 
 	> .main
-		float left
-		width calc(100% - 60px)
+		flex 1
+		min-width 0
 
 		> header
 			display flex
@@ -75,9 +80,18 @@ root(isDark)
 				text-overflow ellipsis
 				color isDark ? #606984 : #d1d8da
 
-			> .time
+			> .info
 				margin-left auto
-				color isDark ? #606984 : #b2b8bb
+				font-size 0.9em
+
+				> *
+					color isDark ? #606984 : #b2b8bb
+
+				> .mobile
+					margin-right 6px
+
+				> .visibility
+					margin-left 6px
 
 		> .body
 

src/client/app/desktop/views/components/notes.note.sub.vue

@@ -44,27 +44,23 @@ export default Vue.extend({
 
 <style lang="stylus" scoped>
 root(isDark)
+	display flex
 	margin 0
 	padding 16px 32px
 	font-size 0.9em
 	background isDark ? #21242d : #fcfcfc
 
-	&:after
-		content ""
-		display block
-		clear both
-
 	> .avatar
+		flex-shrink 0
 		display block
-		float left
 		margin 0 12px 0 0
 		width 48px
 		height 48px
 		border-radius 8px
 
 	> .main
-		float left
-		width calc(100% - 60px)
+		flex 1
+		min-width 0
 
 		> header
 			display flex
@@ -119,8 +115,6 @@ root(isDark)
 					margin-left 6px
 
 		> .body
-			max-height 128px
-			overflow hidden
 
 			> .text
 				cursor default

src/client/app/desktop/views/components/notes.note.vue

@@ -387,20 +387,16 @@ root(isDark)
 			padding-top 8px
 
 	> article
+		display flex
 		padding 28px 32px 18px 32px
 
-		&:after
-			content ""
-			display block
-			clear both
-
 		&:hover
 			> .main > footer > button
 				color isDark ? #707b97 : #888
 
 		> .avatar
+			flex-shrink 0
 			display block
-			float left
 			margin 0 16px 10px 0
 			width 58px
 			height 58px
@@ -410,8 +406,8 @@ root(isDark)
 			//top 74px
 
 		> .main
-			float left
-			width calc(100% - 74px)
+			flex 1
+			min-width 0
 
 			> header
 				display flex

src/client/app/desktop/views/components/post-form.vue

@@ -86,11 +86,21 @@ export default Vue.extend({
 		},
 
 		placeholder(): string {
+			const xs = [
+				'%i18n:common.note-placeholders.a%',
+				'%i18n:common.note-placeholders.b%',
+				'%i18n:common.note-placeholders.c%',
+				'%i18n:common.note-placeholders.d%',
+				'%i18n:common.note-placeholders.e%',
+				'%i18n:common.note-placeholders.f%'
+			];
+			const x = xs[Math.floor(Math.random() * xs.length)];
+
 			return this.renote
 				? '%i18n:@quote-placeholder%'
 				: this.reply
 					? '%i18n:@reply-placeholder%'
-					: '%i18n:@note-placeholder%';
+					: x;
 		},
 
 		submitText(): string {
@@ -98,7 +108,7 @@ export default Vue.extend({
 				? '%i18n:@renote%'
 				: this.reply
 					? '%i18n:@reply%'
-					: '%i18n:@note%';
+					: '%i18n:@submit%';
 		},
 
 		canPost(): boolean {

src/client/app/desktop/views/components/sub-note-content.vue

@@ -5,7 +5,7 @@
 		<span v-if="note.deletedAt" style="opacity: 0.5">%i18n:@deleted%</span>
 		<a class="reply" v-if="note.replyId">%fa:reply%</a>
 		<mk-note-html v-if="note.text" :text="note.text" :i="$store.state.i"/>
-		<a class="rp" v-if="note.renoteId" :href="`/note:${note.renoteId}`">RP: ...</a>
+		<a class="rp" v-if="note.renoteId" :href="`/notes/${note.renoteId}`">RP: ...</a>
 	</div>
 	<details v-if="note.media.length > 0">
 		<summary>({{ '%i18n:@media-count%'.replace('{}', note.media.length) }})</summary>

src/client/app/desktop/views/components/ui-notification.vue

@@ -36,7 +36,7 @@ export default Vue.extend({
 </script>
 
 <style lang="stylus" scoped>
-.mk-ui-notification
+root(isDark)
 	display block
 	position fixed
 	z-index 10000
@@ -46,10 +46,10 @@ export default Vue.extend({
 	margin 0 auto
 	padding 128px 0 0 0
 	width 500px
-	color rgba(#000, 0.6)
-	background rgba(#fff, 0.9)
+	color rgba(isDark ? #fff : #000, 0.6)
+	background rgba(isDark ? #282C37 : #fff, 0.9)
 	border-radius 0 0 8px 8px
-	box-shadow 0 2px 4px rgba(#000, 0.2)
+	box-shadow 0 2px 4px rgba(#000, isDark ? 0.4 : 0.2)
 	transform translateY(-64px)
 	opacity 0
 
@@ -58,4 +58,10 @@ export default Vue.extend({
 		line-height 64px
 		text-align center
 
+.mk-ui-notification[data-darkmode]
+	root(true)
+
+.mk-ui-notification:not([data-darkmode])
+	root(false)
+
 </style>

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

@@ -8,7 +8,7 @@
 		</time>
 	</div>
 	<div class="content">
-		<mk-analog-clock/>
+		<mk-analog-clock :dark="true"/>
 	</div>
 </div>
 </template>

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

@@ -12,7 +12,7 @@
 				<a @click="messaging">
 					%fa:comments%
 					<p>%i18n:@messaging%</p>
-					<template v-if="hasUnreadMessagingMessages">%fa:circle%</template>
+					<template v-if="hasUnreadMessagingMessage">%fa:circle%</template>
 				</a>
 			</li>
 			<li class="game">
@@ -35,48 +35,33 @@ import MkGameWindow from './game-window.vue';
 export default Vue.extend({
 	data() {
 		return {
-			hasUnreadMessagingMessages: false,
 			hasGameInvitations: false,
 			connection: null,
 			connectionId: null
 		};
 	},
+	computed: {
+		hasUnreadMessagingMessage(): boolean {
+			return this.$store.getters.isSignedIn && this.$store.state.i.hasUnreadMessagingMessage;
+		}
+	},
 	mounted() {
 		if (this.$store.getters.isSignedIn) {
 			this.connection = (this as any).os.stream.getConnection();
 			this.connectionId = (this as any).os.stream.use();
 
-			this.connection.on('read_all_messaging_messages', this.onReadAllMessagingMessages);
-			this.connection.on('unread_messaging_message', this.onUnreadMessagingMessage);
 			this.connection.on('othello_invited', this.onOthelloInvited);
 			this.connection.on('othello_no_invites', this.onOthelloNoInvites);
-
-			// Fetch count of unread messaging messages
-			(this as any).api('messaging/unread').then(res => {
-				if (res.count > 0) {
-					this.hasUnreadMessagingMessages = true;
-				}
-			});
 		}
 	},
 	beforeDestroy() {
 		if (this.$store.getters.isSignedIn) {
-			this.connection.off('read_all_messaging_messages', this.onReadAllMessagingMessages);
-			this.connection.off('unread_messaging_message', this.onUnreadMessagingMessage);
 			this.connection.off('othello_invited', this.onOthelloInvited);
 			this.connection.off('othello_no_invites', this.onOthelloNoInvites);
 			(this as any).os.stream.dispose(this.connectionId);
 		}
 	},
 	methods: {
-		onUnreadMessagingMessage() {
-			this.hasUnreadMessagingMessages = true;
-		},
-
-		onReadAllMessagingMessages() {
-			this.hasUnreadMessagingMessages = false;
-		},
-
 		onOthelloInvited() {
 			this.hasGameInvitations = true;
 		},

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

@@ -1,7 +1,7 @@
 <template>
 <div class="notifications">
 	<button :data-active="isOpen" @click="toggle" title="%i18n:@title%">
-		%fa:R bell%<template v-if="hasUnreadNotifications">%fa:circle%</template>
+		%fa:R bell%<template v-if="hasUnreadNotification">%fa:circle%</template>
 	</button>
 	<div class="pop" v-if="isOpen">
 		<mk-notifications/>
@@ -16,44 +16,15 @@ import contains from '../../../common/scripts/contains';
 export default Vue.extend({
 	data() {
 		return {
-			isOpen: false,
-			hasUnreadNotifications: false,
-			connection: null,
-			connectionId: null
+			isOpen: false
 		};
 	},
-	mounted() {
-		if (this.$store.getters.isSignedIn) {
-			this.connection = (this as any).os.stream.getConnection();
-			this.connectionId = (this as any).os.stream.use();
-
-			this.connection.on('read_all_notifications', this.onReadAllNotifications);
-			this.connection.on('unread_notification', this.onUnreadNotification);
-
-			// Fetch count of unread notifications
-			(this as any).api('notifications/get_unread_count').then(res => {
-				if (res.count > 0) {
-					this.hasUnreadNotifications = true;
-				}
-			});
-		}
-	},
-	beforeDestroy() {
-		if (this.$store.getters.isSignedIn) {
-			this.connection.off('read_all_notifications', this.onReadAllNotifications);
-			this.connection.off('unread_notification', this.onUnreadNotification);
-			(this as any).os.stream.dispose(this.connectionId);
+	computed: {
+		hasUnreadNotification(): boolean {
+			return this.$store.getters.isSignedIn && this.$store.state.i.hasUnreadNotification;
 		}
 	},
 	methods: {
-		onReadAllNotifications() {
-			this.hasUnreadNotifications = false;
-		},
-
-		onUnreadNotification() {
-			this.hasUnreadNotifications = true;
-		},
-
 		toggle() {
 			this.isOpen ? this.close() : this.open();
 		},

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

@@ -150,8 +150,8 @@ root(isDark)
 					display block
 					width 100%
 					height 48px
-					background-image url(/assets/desktop/header-logo.svg)
-					background-size 46px
+					background-image isDark ? url('/assets/desktop/header-icon.dark.svg') : url('/assets/desktop/header-icon.light.svg')
+					background-size 24px
 					background-position center
 					background-repeat no-repeat
 					opacity 0.3

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

@@ -2,7 +2,7 @@
 <mk-ui>
 	<main v-if="!fetching">
 		<template v-for="favorite in favorites">
-			<mk-note-detail :note="favorite.note" :key="favorite.note.id"/>
+			<mk-note-detail class="post" :note="favorite.note" :key="favorite.note.id"/>
 		</template>
 		<a v-if="existMore" @click="more">%i18n:@more%</a>
 	</main>
@@ -70,4 +70,7 @@ main
 	margin 0 auto
 	padding 16px
 	max-width 700px
+
+	> .post
+		margin-bottom 16px
 </style>

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

@@ -4,9 +4,20 @@
 		<template v-if="$store.state.device.darkmode">%fa:moon%</template>
 		<template v-else>%fa:R moon%</template>
 	</button>
-	<main>
-		<img :src="$store.state.device.darkmode ? 'assets/title-dark.svg' : 'assets/title.svg'" alt="Misskey">
-		<p><button class="signup" @click="signup">%i18n:@signup-button%</button><button class="signin" @click="signin">%i18n:@signin-button%</button></p>
+	<main v-if="about" class="about">
+		<article>
+			<h1>%i18n:common.about-title%</h1>
+			<p v-html="'%i18n:common.about%'"></p>
+			<span class="gotit" @click="about = false">%i18n:@gotit%</span>
+		</article>
+	</main>
+	<main v-else class="index">
+		<img :src="$store.state.device.darkmode ? 'assets/title.dark.svg' : 'assets/title.light.svg'" alt="Misskey">
+		<p class="desc"><b>%i18n:common.misskey%</b> - <span @click="about = true">%i18n:@about%</span></p>
+		<p class="account">
+			<button class="signup" @click="signup">%i18n:@signup-button%</button>
+			<button class="signin" @click="signin">%i18n:@signin-button%</button>
+		</p>
 
 		<div class="tl">
 			<header>%fa:comments R% %i18n:@timeline%<div><span></span><span></span><span></span></div></header>
@@ -33,12 +44,12 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import { docsUrl, copyright, lang } from '../../../config';
+import { copyright } from '../../../config';
 
 export default Vue.extend({
 	data() {
 		return {
-			aboutUrl: `${docsUrl}/${lang}/about`,
+			about: false,
 			copyright
 		};
 	},
@@ -69,13 +80,18 @@ export default Vue.extend({
 <style lang="stylus" scoped>
 @import '~const.styl'
 
+@import url(https://fonts.googleapis.com/earlyaccess/notosansjp.css);
+
 root(isDark)
 	display flex
 	flex-direction column
 	flex 1
+	background-image isDark ? url('/assets/welcome-bg.dark.svg') : url('/assets/welcome-bg.light.svg')
+	background-size cover
+	background-position center
 
 	> button
-		position absolute
+		position fixed
 		z-index 1
 		top 0
 		left 0
@@ -87,81 +103,120 @@ root(isDark)
 		flex 1
 		padding 64px 0 0 0
 		text-align center
-		color isDark ? #9aa4b3 : #555
 
-		> img
-			width 350px
+		&.about
+			font-family 'Noto Sans JP'
+			color isDark ? #fff : #627574
 
-		> p
-			margin 8px 0
-			line-height 2em
+			> article
+				max-width 700px
+				margin 42px auto 0 auto
+				padding 64px 82px
+				background isDark ? #282C37 : #fff
+				box-shadow 0 8px 32px rgba(#000, 0.15)
 
-			button
-				padding 8px 16px
-				font-size inherit
+				> h1
+					margin 0
+					font-weight 900
 
-			.signup
-				color $theme-color
-				border solid 2px $theme-color
-				border-radius 4px
+				> p
+					margin 20px 0
+					line-height 2em
 
-				&:focus
-					box-shadow 0 0 0 3px rgba($theme-color, 0.2)
+				> .gotit
+					color $theme-color
+					cursor pointer
 
-				&:hover
-					color $theme-color-foreground
-					background $theme-color
+					&:hover
+						text-decoration underline
 
-				&:active
-					color $theme-color-foreground
-					background darken($theme-color, 10%)
-					border-color darken($theme-color, 10%)
+		&.index
+			color isDark ? #9aa4b3 : #555
 
-			.signin
-				&:hover
-					color isDark ? #fff : #000
+			> img
+				width 350px
 
-		> .tl
-			margin 32px auto 0 auto
-			width 410px
-			text-align left
-			background isDark ? #313543 : #fff
-			border-radius 8px
-			box-shadow 0 8px 32px rgba(#000, 0.15)
-			overflow hidden
+			> .desc
+				margin -12px 0 24px 0
+				color isDark ? #fff : #555
 
-			> header
-				z-index 1
-				padding 12px 16px
-				color isDark ? #e3e5e8 : #888d94
-				box-shadow 0 1px 0px rgba(#000, 0.1)
+				> span
+					color $theme-color
+					cursor pointer
 
-				> div
-					position absolute
-					top 0
-					right 0
-					padding inherit
+					&:hover
+						text-decoration underline
 
-					> span
-						display inline-block
-						height 11px
-						width 11px
-						margin-left 6px
-						border-radius 100%
-						vertical-align middle
+			> .account
+				margin 8px 0
+				line-height 2em
 
-						&:nth-child(1)
-							background #5BCC8B
+				button
+					padding 8px 16px
+					font-size inherit
 
-						&:nth-child(2)
-							background #E6BB46
+				.signup
+					color $theme-color
+					border solid 2px $theme-color
+					border-radius 4px
 
-						&:nth-child(3)
-							background #DF7065
+					&:focus
+						box-shadow 0 0 0 3px rgba($theme-color, 0.2)
 
-			> .mk-welcome-timeline
-				max-height 350px
-				overflow auto
+					&:hover
+						color $theme-color-foreground
+						background $theme-color
+
+					&:active
+						color $theme-color-foreground
+						background darken($theme-color, 10%)
+						border-color darken($theme-color, 10%)
+
+				.signin
+					&:hover
+						color isDark ? #fff : #000
+
+			> .tl
+				margin 32px auto 0 auto
+				width 410px
+				text-align left
+				background isDark ? #313543 : #fff
+				border-radius 8px
+				box-shadow 0 8px 32px rgba(#000, 0.15)
+				overflow hidden
+
+				> header
+					z-index 1
+					padding 12px 16px
+					color isDark ? #e3e5e8 : #888d94
+					box-shadow 0 1px 0px rgba(#000, 0.1)
+
+					> div
+						position absolute
+						top 0
+						right 0
+						padding inherit
+
+						> span
+							display inline-block
+							height 11px
+							width 11px
+							margin-left 6px
+							border-radius 100%
+							vertical-align middle
+
+							&:nth-child(1)
+								background #5BCC8B
+
+							&:nth-child(2)
+								background #E6BB46
+
+							&:nth-child(3)
+								background #DF7065
+
+				> .mk-welcome-timeline
+					max-height 350px
+					overflow auto
 
 	> footer
 		font-size 12px

src/client/app/desktop/views/widgets/post-form.vue

@@ -3,7 +3,7 @@
 	<template v-if="props.design == 0">
 		<p class="title">%fa:pencil-alt%%i18n:@title%</p>
 	</template>
-	<textarea :disabled="posting" v-model="text" @keydown="onKeydown" placeholder="%i18n:@placeholder%"></textarea>
+	<textarea :disabled="posting" v-model="text" @keydown="onKeydown" :placeholder="placeholder"></textarea>
 	<button @click="post" :disabled="posting">%i18n:@note%</button>
 </div>
 </template>
@@ -22,6 +22,19 @@ export default define({
 			text: ''
 		};
 	},
+	computed: {
+		placeholder(): string {
+			const xs = [
+				'%i18n:common.note-placeholders.a%',
+				'%i18n:common.note-placeholders.b%',
+				'%i18n:common.note-placeholders.c%',
+				'%i18n:common.note-placeholders.d%',
+				'%i18n:common.note-placeholders.e%',
+				'%i18n:common.note-placeholders.f%'
+			];
+			return xs[Math.floor(Math.random() * xs.length)];
+		}
+	},
 	methods: {
 		func() {
 			if (this.props.design == 1) {

src/client/app/init.ts

@@ -67,14 +67,6 @@ const html = document.documentElement;
 html.setAttribute('lang', lang);
 //#endregion
 
-//#region Set description meta tag
-const head = document.getElementsByTagName('head')[0];
-const meta = document.createElement('meta');
-meta.setAttribute('name', 'description');
-meta.setAttribute('content', '%i18n:common.misskey%');
-head.appendChild(meta);
-//#endregion
-
 // iOSでプライベートモードだとlocalStorageが使えないので既存のメソッドを上書きする
 try {
 	localStorage.setItem('kyoppie', 'yuppie');

src/client/app/mobile/script.ts

@@ -36,6 +36,9 @@ import MkNote from './views/pages/note.vue';
 import MkSearch from './views/pages/search.vue';
 import MkFollowers from './views/pages/followers.vue';
 import MkFollowing from './views/pages/following.vue';
+import MkFavorites from './views/pages/favorites.vue';
+import MkUserLists from './views/pages/user-lists.vue';
+import MkUserList from './views/pages/user-list.vue';
 import MkSettings from './views/pages/settings.vue';
 import MkOthello from './views/pages/othello.vue';
 
@@ -72,6 +75,9 @@ init((launch) => {
 			{ path: '/signup', name: 'signup', component: MkSignup },
 			{ path: '/i/settings', name: 'settings', component: MkSettings },
 			{ path: '/i/notifications', name: 'notifications', component: MkNotifications },
+			{ path: '/i/favorites', name: 'favorites', component: MkFavorites },
+			{ path: '/i/lists', name: 'user-lists', component: MkUserLists },
+			{ path: '/i/lists/:list', name: 'user-list', component: MkUserList },
 			{ path: '/i/widgets', name: 'widgets', component: MkWidgets },
 			{ path: '/i/messaging', name: 'messaging', component: MkMessaging },
 			{ path: '/i/messaging/:user', component: MkMessagingRoom },

src/client/app/mobile/views/components/note-detail.sub.vue

@@ -1,101 +0,0 @@
-<template>
-<div class="root sub">
-	<mk-avatar class="avatar" :user="note.user"/>
-	<div class="main">
-		<header>
-			<router-link class="name" :to="note.user | userPage">{{ note.user | userName }}</router-link>
-			<span class="username"><mk-acct :user="note.user"/></span>
-			<router-link class="time" :to="note | notePage">
-				<mk-time :time="note.createdAt"/>
-			</router-link>
-		</header>
-		<div class="body">
-			<mk-sub-note-content class="text" :note="note"/>
-		</div>
-	</div>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-
-export default Vue.extend({
-	props: ['note']
-});
-</script>
-
-<style lang="stylus" scoped>
-root(isDark)
-	padding 8px
-	font-size 0.9em
-	background isDark ? #21242d : #fdfdfd
-
-	@media (min-width 500px)
-		padding 12px
-
-	@media (min-width 600px)
-		padding 24px 32px
-
-	&:after
-		content ""
-		display block
-		clear both
-
-	> .avatar
-		display block
-		float left
-		margin 0 12px 0 0
-		width 48px
-		height 48px
-		border-radius 8px
-
-	> .main
-		float left
-		width calc(100% - 60px)
-
-		> header
-			display flex
-			align-items baseline
-			margin-bottom 4px
-			white-space nowrap
-
-			> .name
-				display block
-				margin 0 .5em 0 0
-				padding 0
-				overflow hidden
-				color isDark ? #fff : #607073
-				font-size 1em
-				font-weight 700
-				text-align left
-				text-decoration none
-				text-overflow ellipsis
-
-				&:hover
-					text-decoration underline
-
-			> .username
-				text-align left
-				margin 0 .5em 0 0
-				color isDark ? #606984 : #d1d8da
-
-			> .time
-				margin-left auto
-				color isDark ? #606984 : #b2b8bb
-
-		> .body
-
-			> .text
-				cursor default
-				margin 0
-				padding 0
-				font-size 1.1em
-				color isDark ? #959ba7 : #717171
-
-.root.sub[data-darkmode]
-	root(true)
-
-.root.sub:not([data-darkmode])
-	root(false)
-
-</style>

src/client/app/mobile/views/components/note-detail.vue

@@ -87,7 +87,7 @@ import parse from '../../../../../text/parse';
 
 import MkNoteMenu from '../../../common/views/components/note-menu.vue';
 import MkReactionPicker from '../../../common/views/components/reaction-picker.vue';
-import XSub from './note-detail.sub.vue';
+import XSub from './note.sub.vue';
 
 export default Vue.extend({
 	components: {
@@ -172,7 +172,7 @@ export default Vue.extend({
 	},
 
 	methods: {
-		fetchContext() {
+		fetchConversation() {
 			this.conversationFetching = true;
 
 			// Fetch conversation
@@ -216,8 +216,6 @@ export default Vue.extend({
 
 root(isDark)
 	overflow hidden
-	margin 0 auto
-	padding 0
 	width 100%
 	text-align left
 	background isDark ? #282C37 : #fff

src/client/app/mobile/views/components/note-preview.vue

@@ -9,9 +9,18 @@
 			<span class="is-bot" v-if="note.user.isBot">%i18n:@bot%</span>
 			<span class="is-cat" v-if="note.user.isCat">%i18n:@cat%</span>
 			<span class="username"><mk-acct :user="note.user"/></span>
-			<router-link class="time" :to="note | notePage">
-				<mk-time :time="note.createdAt"/>
-			</router-link>
+			<div class="info">
+				<span class="mobile" v-if="note.viaMobile">%fa:mobile-alt%</span>
+				<router-link class="created-at" :to="note | notePage">
+					<mk-time :time="note.createdAt"/>
+				</router-link>
+				<span class="visibility" v-if="note.visibility != 'public'">
+					<template v-if="note.visibility == 'home'">%fa:home%</template>
+					<template v-if="note.visibility == 'followers'">%fa:unlock%</template>
+					<template v-if="note.visibility == 'specified'">%fa:envelope%</template>
+					<template v-if="note.visibility == 'private'">%fa:lock%</template>
+				</span>
+			</div>
 		</header>
 		<div class="body">
 			<mk-sub-note-content class="text" :note="note"/>
@@ -30,14 +39,16 @@ export default Vue.extend({
 
 <style lang="stylus" scoped>
 root(isDark)
+	display flex
 	margin 0
 	padding 0
-	font-size 0.9em
+	font-size 10px
 
-	&:after
-		content ""
-		display block
-		clear both
+	@media (min-width 350px)
+		font-size 12px
+
+	@media (min-width 500px)
+		font-size 14px
 
 	&.smart
 		> .main
@@ -47,24 +58,26 @@ root(isDark)
 				align-items center
 
 	> .avatar
+		flex-shrink 0
 		display block
-		float left
-		margin 0 12px 0 0
-		width 48px
-		height 48px
+		margin 0 10px 0 0
+		width 40px
+		height 40px
 		border-radius 8px
 
-		@media (max-width 500px)
+		@media (min-width 350px)
 			margin 0 10px 0 0
 			width 44px
 			height 44px
 
-	> .main
-		float left
-		width calc(100% - 60px)
+		@media (min-width 500px)
+			margin 0 12px 0 0
+			width 48px
+			height 48px
 
-		@media (max-width 500px)
-			width calc(100% - 54px)
+	> .main
+		flex 1
+		min-width 0
 
 		> header
 			display flex
@@ -97,7 +110,7 @@ root(isDark)
 				align-self center
 				margin 0 0.5em 0 0
 				padding 1px 6px
-				font-size 10px
+				font-size 0.8em
 				color isDark ? #758188 : #aaa
 				border solid 1px isDark ? #57616f : #ddd
 				border-radius 3px
@@ -112,9 +125,18 @@ root(isDark)
 				text-overflow ellipsis
 				color isDark ? #606984 : #d1d8da
 
-			> .time
+			> .info
 				margin-left auto
-				color isDark ? #606984 : #b2b8bb
+				font-size 0.9em
+
+				> *
+					color isDark ? #606984 : #b2b8bb
+
+				> .mobile
+					margin-right 6px
+
+				> .visibility
+					margin-left 6px
 
 		> .body
 

src/client/app/mobile/views/components/note.sub.vue

@@ -33,16 +33,33 @@
 import Vue from 'vue';
 
 export default Vue.extend({
-	props: ['note']
+	props: {
+		note: {
+			type: Object,
+			required: true
+		},
+		// TODO
+		truncate: {
+			type: Boolean,
+			default: true
+		}
+	}
 });
 </script>
 
 <style lang="stylus" scoped>
 root(isDark)
+	display flex
 	padding 16px
-	font-size 0.9em
+	font-size 10px
 	background isDark ? #21242d : #fcfcfc
 
+	@media (min-width 350px)
+		font-size 12px
+
+	@media (min-width 500px)
+		font-size 14px
+
 	@media (min-width 600px)
 		padding 24px 32px
 
@@ -53,30 +70,27 @@ root(isDark)
 			> header
 				align-items center
 
-	&:after
-		content ""
-		display block
-		clear both
-
 	> .avatar
+		flex-shrink 0
 		display block
-		float left
-		margin 0 10px 0 0
-		width 42px
-		height 42px
+		margin 0 8px 0 0
+		width 38px
+		height 38px
 		border-radius 8px
 
+		@media (min-width 350px)
+			margin-right 10px
+			width 42px
+			height 42px
+
 		@media (min-width 500px)
 			margin-right 14px
 			width 50px
 			height 50px
 
 	> .main
-		float left
-		width calc(100% - 52px)
-
-		@media (min-width 500px)
-			width calc(100% - 64px)
+		flex 1
+		min-width 0
 
 		> header
 			display flex
@@ -112,7 +126,7 @@ root(isDark)
 				align-self center
 				margin 0 0.5em 0 0
 				padding 1px 5px
-				font-size 10px
+				font-size 0.8em
 				color isDark ? #758188 : #aaa
 				border solid 1px isDark ? #57616f : #ddd
 				border-radius 3px
@@ -140,11 +154,8 @@ root(isDark)
 					margin-left 6px
 
 		> .body
-			max-height 128px
-			overflow hidden
 
 			> .text
-				cursor default
 				margin 0
 				padding 0
 				color isDark ? #959ba7 : #717171

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

@@ -269,8 +269,6 @@ root(isDark)
 	&.smart
 		> article
 			> .main
-				width 100%
-
 				> header
 					align-items center
 					margin-bottom 4px
@@ -328,27 +326,28 @@ root(isDark)
 			padding-top 8px
 
 	> article
+		display flex
 		padding 16px 16px 9px
 
 		@media (min-width 600px)
 			padding 32px 32px 22px
 
-		&:after
-			content ""
-			display block
-			clear both
-
 		> .avatar
+			flex-shrink 0
 			display block
-			float left
 			margin 0 10px 8px 0
-			width 48px
-			height 48px
+			width 42px
+			height 42px
 			border-radius 6px
 			//position -webkit-sticky
 			//position sticky
 			//top 62px
 
+			@media (min-width 350px)
+				width 48px
+				height 48px
+				border-radius 6px
+
 			@media (min-width 500px)
 				margin-right 16px
 				width 58px
@@ -356,11 +355,8 @@ root(isDark)
 				border-radius 8px
 
 		> .main
-			float left
-			width calc(100% - 58px)
-
-			@media (min-width 500px)
-				width calc(100% - 74px)
+			flex 1
+			min-width 0
 
 			> header
 				display flex
@@ -393,7 +389,7 @@ root(isDark)
 					align-self center
 					margin 0 0.5em 0 0
 					padding 1px 6px
-					font-size 12px
+					font-size 0.8em
 					color isDark ? #758188 : #aaa
 					border solid 1px isDark ? #57616f : #ddd
 					border-radius 3px
@@ -422,6 +418,8 @@ root(isDark)
 						margin-left 6px
 
 			> .body
+				@media (min-width 700px)
+					font-size 1.1em
 
 				> .cw
 					cursor default

src/client/app/mobile/views/components/post-form.vue

@@ -5,11 +5,7 @@
 		<div>
 			<span class="text-count" :class="{ over: text.length > 1000 }">{{ 1000 - text.length }}</span>
 			<span class="geo" v-if="geo">%fa:map-marker-alt%</span>
-			<button class="submit" :disabled="posting" @click="post">
-				<template v-if="reply">%i18n:@reply%</template>
-				<template v-else-if="renote">%i18n:@renote%</template>
-				<template v-else>%i18n:@submit%</template>
-			</button>
+			<button class="submit" :disabled="posting" @click="post">{{ submitText }}</button>
 		</div>
 	</header>
 	<div class="form">
@@ -20,7 +16,7 @@
 			<a @click="addVisibleUser">+%i18n:@add-visible-user%</a>
 		</div>
 		<input v-show="useCw" v-model="cw" placeholder="%i18n:@cw-placeholder%">
-		<textarea v-model="text" ref="text" :disabled="posting" :placeholder="reply ? '%i18n:@reply-placeholder%' : renote ? '%i18n:@renote-placeholder%' : '%i18n:@note-placeholder%'"></textarea>
+		<textarea v-model="text" ref="text" :disabled="posting" :placeholder="placeholder"></textarea>
 		<div class="attaches" v-show="files.length != 0">
 			<x-draggable class="files" :list="files" :options="{ animation: 150 }">
 				<div class="file" v-for="file in files" :key="file.id">
@@ -74,6 +70,46 @@ export default Vue.extend({
 		};
 	},
 
+	computed: {
+		draftId(): string {
+			return this.renote
+				? 'renote:' + this.renote.id
+				: this.reply
+					? 'reply:' + this.reply.id
+					: 'note';
+		},
+
+		placeholder(): string {
+			const xs = [
+				'%i18n:common.note-placeholders.a%',
+				'%i18n:common.note-placeholders.b%',
+				'%i18n:common.note-placeholders.c%',
+				'%i18n:common.note-placeholders.d%',
+				'%i18n:common.note-placeholders.e%',
+				'%i18n:common.note-placeholders.f%'
+			];
+			const x = xs[Math.floor(Math.random() * xs.length)];
+
+			return this.renote
+				? '%i18n:@quote-placeholder%'
+				: this.reply
+					? '%i18n:@reply-placeholder%'
+					: x;
+		},
+
+		submitText(): string {
+			return this.renote
+				? '%i18n:@renote%'
+				: this.reply
+					? '%i18n:@reply%'
+					: '%i18n:@submit%';
+		},
+
+		canPost(): boolean {
+			return !this.posting && (this.text.length != 0 || this.files.length != 0 || this.poll || this.renote);
+		}
+	},
+
 	mounted() {
 		if (this.reply && this.reply.user.host != null) {
 			this.text = `@${this.reply.user.username}@${this.reply.user.host} `;

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

@@ -6,7 +6,7 @@
 		<p ref="welcomeback" v-if="$store.getters.isSignedIn">おかえりなさい、<b>{{ $store.state.i | userName }}</b>さん</p>
 		<div class="content" ref="mainContainer">
 			<button class="nav" @click="$parent.isDrawerOpening = true">%fa:bars%</button>
-			<template v-if="hasUnreadNotifications || hasUnreadMessagingMessages || hasGameInvitations">%fa:circle%</template>
+			<template v-if="hasUnreadNotification || hasUnreadMessagingMessage || hasGameInvitation">%fa:circle%</template>
 			<h1>
 				<slot>Misskey</slot>
 			</h1>
@@ -25,13 +25,19 @@ export default Vue.extend({
 	props: ['func'],
 	data() {
 		return {
-			hasUnreadNotifications: false,
-			hasUnreadMessagingMessages: false,
-			hasGameInvitations: false,
+			hasGameInvitation: false,
 			connection: null,
 			connectionId: null
 		};
 	},
+	computed: {
+		hasUnreadNotification(): boolean {
+			return this.$store.getters.isSignedIn && this.$store.state.i.hasUnreadNotification;
+		},
+		hasUnreadMessagingMessage(): boolean {
+			return this.$store.getters.isSignedIn && this.$store.state.i.hasUnreadMessagingMessage;
+		}
+	},
 	mounted() {
 		this.$store.commit('setUiHeaderHeight', 48);
 
@@ -39,27 +45,9 @@ export default Vue.extend({
 			this.connection = (this as any).os.stream.getConnection();
 			this.connectionId = (this as any).os.stream.use();
 
-			this.connection.on('read_all_notifications', this.onReadAllNotifications);
-			this.connection.on('unread_notification', this.onUnreadNotification);
-			this.connection.on('read_all_messaging_messages', this.onReadAllMessagingMessages);
-			this.connection.on('unread_messaging_message', this.onUnreadMessagingMessage);
 			this.connection.on('othello_invited', this.onOthelloInvited);
 			this.connection.on('othello_no_invites', this.onOthelloNoInvites);
 
-			// Fetch count of unread notifications
-			(this as any).api('notifications/get_unread_count').then(res => {
-				if (res.count > 0) {
-					this.hasUnreadNotifications = true;
-				}
-			});
-
-			// Fetch count of unread messaging messages
-			(this as any).api('messaging/unread').then(res => {
-				if (res.count > 0) {
-					this.hasUnreadMessagingMessages = true;
-				}
-			});
-
 			const ago = (new Date().getTime() - new Date(this.$store.state.i.lastUsedAt).getTime()) / 1000;
 			const isHisasiburi = ago >= 3600;
 			this.$store.state.i.lastUsedAt = new Date();
@@ -110,33 +98,17 @@ export default Vue.extend({
 	},
 	beforeDestroy() {
 		if (this.$store.getters.isSignedIn) {
-			this.connection.off('read_all_notifications', this.onReadAllNotifications);
-			this.connection.off('unread_notification', this.onUnreadNotification);
-			this.connection.off('read_all_messaging_messages', this.onReadAllMessagingMessages);
-			this.connection.off('unread_messaging_message', this.onUnreadMessagingMessage);
 			this.connection.off('othello_invited', this.onOthelloInvited);
 			this.connection.off('othello_no_invites', this.onOthelloNoInvites);
 			(this as any).os.stream.dispose(this.connectionId);
 		}
 	},
 	methods: {
-		onReadAllNotifications() {
-			this.hasUnreadNotifications = false;
-		},
-		onUnreadNotification() {
-			this.hasUnreadNotifications = true;
-		},
-		onReadAllMessagingMessages() {
-			this.hasUnreadMessagingMessages = false;
-		},
-		onUnreadMessagingMessage() {
-			this.hasUnreadMessagingMessages = true;
-		},
 		onOthelloInvited() {
-			this.hasGameInvitations = true;
+			this.hasGameInvitation = true;
 		},
 		onOthelloNoInvites() {
-			this.hasGameInvitations = false;
+			this.hasGameInvitation = false;
 		}
 	}
 });

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

@@ -15,21 +15,21 @@
 			</router-link>
 			<div class="links">
 				<ul>
-					<li><router-link to="/" :data-active="$route.name == 'index'">%fa:home%%i18n:@home%%fa:angle-right%</router-link></li>
-					<li><router-link to="/i/notifications" :data-active="$route.name == 'notifications'">%fa:R bell%%i18n:@notifications%<template v-if="hasUnreadNotifications">%fa:circle%</template>%fa:angle-right%</router-link></li>
-					<li><router-link to="/i/messaging" :data-active="$route.name == 'messaging'">%fa:R comments%%i18n:@messaging%<template v-if="hasUnreadMessagingMessages">%fa:circle%</template>%fa:angle-right%</router-link></li>
-					<li><router-link to="/othello" :data-active="$route.name == 'othello'">%fa:gamepad%ゲーム<template v-if="hasGameInvitations">%fa:circle%</template>%fa:angle-right%</router-link></li>
+					<li><router-link to="/" :data-active="$route.name == 'index'">%fa:home%%i18n:@timeline%%fa:angle-right%</router-link></li>
+					<li><router-link to="/i/notifications" :data-active="$route.name == 'notifications'">%fa:R bell%%i18n:@notifications%<template v-if="hasUnreadNotification">%fa:circle%</template>%fa:angle-right%</router-link></li>
+					<li><router-link to="/i/messaging" :data-active="$route.name == 'messaging'">%fa:R comments%%i18n:@messaging%<template v-if="hasUnreadMessagingMessage">%fa:circle%</template>%fa:angle-right%</router-link></li>
+					<li><router-link to="/othello" :data-active="$route.name == 'othello'">%fa:gamepad%%i18n:@game%<template v-if="hasGameInvitation">%fa:circle%</template>%fa:angle-right%</router-link></li>
 				</ul>
 				<ul>
-					<li><router-link to="/i/widgets" :data-active="$route.name == 'widgets'">%fa:quidditch%%i18n:@widgets%%fa:angle-right%</router-link></li>
+					<li><router-link to="/i/widgets" :data-active="$route.name == 'widgets'">%fa:R calendar-alt%%i18n:@widgets%%fa:angle-right%</router-link></li>
+					<li><router-link to="/i/favorites" :data-active="$route.name == 'favorites'">%fa:star%%i18n:@favorites%%fa:angle-right%</router-link></li>
+					<li><router-link to="/i/lists" :data-active="$route.name == 'user-lists'">%fa:list%%i18n:@user-lists%%fa:angle-right%</router-link></li>
 					<li><router-link to="/i/drive" :data-active="$route.name == 'drive'">%fa:cloud%%i18n:@drive%%fa:angle-right%</router-link></li>
 				</ul>
 				<ul>
 					<li><a @click="search">%fa:search%%i18n:@search%%fa:angle-right%</a></li>
-				</ul>
-				<ul>
 					<li><router-link to="/i/settings" :data-active="$route.name == 'settings'">%fa:cog%%i18n:@settings%%fa:angle-right%</router-link></li>
-					<li @click="dark"><p><template v-if="$store.state.device.darkmode">%fa:moon%</template><template v-else>%fa:R moon%</template><span>ダークモード</span></p></li>
+					<li @click="dark"><p><template v-if="$store.state.device.darkmode">%fa:moon%</template><template v-else>%fa:R moon%</template><span>%i18n:@darkmode%</span></p></li>
 				</ul>
 			</div>
 			<a :href="aboutUrl"><p class="about">%i18n:@about%</p></a>
@@ -46,47 +46,31 @@ export default Vue.extend({
 	props: ['isOpen'],
 	data() {
 		return {
-			hasUnreadNotifications: false,
-			hasUnreadMessagingMessages: false,
-			hasGameInvitations: false,
+			hasGameInvitation: false,
 			connection: null,
 			connectionId: null,
 			aboutUrl: `${docsUrl}/${lang}/about`
 		};
 	},
+	computed: {
+		hasUnreadNotification(): boolean {
+			return this.$store.getters.isSignedIn && this.$store.state.i.hasUnreadNotification;
+		},
+		hasUnreadMessagingMessage(): boolean {
+			return this.$store.getters.isSignedIn && this.$store.state.i.hasUnreadMessagingMessage;
+		}
+	},
 	mounted() {
 		if (this.$store.getters.isSignedIn) {
 			this.connection = (this as any).os.stream.getConnection();
 			this.connectionId = (this as any).os.stream.use();
 
-			this.connection.on('read_all_notifications', this.onReadAllNotifications);
-			this.connection.on('unread_notification', this.onUnreadNotification);
-			this.connection.on('read_all_messaging_messages', this.onReadAllMessagingMessages);
-			this.connection.on('unread_messaging_message', this.onUnreadMessagingMessage);
 			this.connection.on('othello_invited', this.onOthelloInvited);
 			this.connection.on('othello_no_invites', this.onOthelloNoInvites);
-
-			// Fetch count of unread notifications
-			(this as any).api('notifications/get_unread_count').then(res => {
-				if (res.count > 0) {
-					this.hasUnreadNotifications = true;
-				}
-			});
-
-			// Fetch count of unread messaging messages
-			(this as any).api('messaging/unread').then(res => {
-				if (res.count > 0) {
-					this.hasUnreadMessagingMessages = true;
-				}
-			});
 		}
 	},
 	beforeDestroy() {
 		if (this.$store.getters.isSignedIn) {
-			this.connection.off('read_all_notifications', this.onReadAllNotifications);
-			this.connection.off('unread_notification', this.onUnreadNotification);
-			this.connection.off('read_all_messaging_messages', this.onReadAllMessagingMessages);
-			this.connection.off('unread_messaging_message', this.onUnreadMessagingMessage);
 			this.connection.off('othello_invited', this.onOthelloInvited);
 			this.connection.off('othello_no_invites', this.onOthelloNoInvites);
 			(this as any).os.stream.dispose(this.connectionId);
@@ -98,23 +82,11 @@ export default Vue.extend({
 			if (query == null || query == '') return;
 			this.$router.push('/search?q=' + encodeURIComponent(query));
 		},
-		onReadAllNotifications() {
-			this.hasUnreadNotifications = false;
-		},
-		onUnreadNotification() {
-			this.hasUnreadNotifications = true;
-		},
-		onReadAllMessagingMessages() {
-			this.hasUnreadMessagingMessages = false;
-		},
-		onUnreadMessagingMessage() {
-			this.hasUnreadMessagingMessages = true;
-		},
 		onOthelloInvited() {
-			this.hasGameInvitations = true;
+			this.hasGameInvitation = true;
 		},
 		onOthelloNoInvites() {
-			this.hasGameInvitations = false;
+			this.hasGameInvitation = false;
 		},
 		dark() {
 			this.$store.commit('device/set', {
@@ -186,7 +158,10 @@ root(isDark)
 		&:first-child
 			margin-top 0
 
-		li
+		&:last-child
+			margin-bottom 0
+
+		> li
 			display block
 			font-size 1em
 			line-height 1em
@@ -209,6 +184,8 @@ root(isDark)
 
 				> [data-fa]:first-child
 					margin-right 0.5em
+					width 20px
+					text-align center
 
 				> [data-fa].circle
 					margin-left 6px
@@ -226,7 +203,7 @@ root(isDark)
 					opacity 0.5
 
 	.about
-		margin 0
+		margin 0 0 8px 0
 		padding 1em 0
 		text-align center
 		font-size 0.8em

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

@@ -0,0 +1,94 @@
+<template>
+<mk-ui>
+	<span slot="header">%fa:star%%i18n:@title%</span>
+
+	<main>
+		<template v-for="favorite in favorites">
+			<mk-note-detail class="post" :note="favorite.note" :key="favorite.note.id"/>
+		</template>
+		<a v-if="existMore" @click="more">%i18n:@more%</a>
+	</main>
+</mk-ui>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import Progress from '../../../common/scripts/loading';
+
+export default Vue.extend({
+	data() {
+		return {
+			fetching: true,
+			favorites: [],
+			existMore: false,
+			moreFetching: false
+		};
+	},
+	created() {
+		this.fetch();
+	},
+	mounted() {
+		document.title = 'Misskey | %i18n:@notifications%';
+	},
+	methods: {
+		fetch() {
+			Progress.start();
+			this.fetching = true;
+
+			(this as any).api('i/favorites', {
+				limit: 11
+			}).then(favorites => {
+				if (favorites.length == 11) {
+					this.existMore = true;
+					favorites.pop();
+				}
+
+				this.favorites = favorites;
+				this.fetching = false;
+
+				Progress.done();
+			});
+		},
+		more() {
+			this.moreFetching = true;
+			(this as any).api('i/favorites', {
+				limit: 11,
+				maxId: this.favorites[this.favorites.length - 1].id
+			}).then(favorites => {
+				if (favorites.length == 11) {
+					this.existMore = true;
+					favorites.pop();
+				} else {
+					this.existMore = false;
+				}
+
+				this.favorites = this.favorites.concat(favorites);
+				this.moreFetching = false;
+			});
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+main
+	width 100%
+	max-width 680px
+	margin 0 auto
+	padding 8px
+
+	> .post
+		margin-bottom 8px
+
+	@media (min-width 500px)
+		padding 16px
+
+		> .post
+			margin-bottom 16px
+
+	@media (min-width 600px)
+		padding 32px
+
+</style>

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

@@ -0,0 +1,63 @@
+<template>
+<mk-ui>
+	<span slot="header" v-if="!fetching">%fa:list%{{ list.title }}</span>
+
+	<main v-if="!fetching">
+		<ul>
+			<li v-for="user in list.users" :key="user.id"><router-link :to="user | userPage">{{ user | userName }}</router-link></li>
+		</ul>
+	</main>
+</mk-ui>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import Progress from '../../../common/scripts/loading';
+
+export default Vue.extend({
+	data() {
+		return {
+			fetching: true,
+			list: null
+		};
+	},
+	watch: {
+		$route: 'fetch'
+	},
+	created() {
+		this.fetch();
+	},
+	methods: {
+		fetch() {
+			Progress.start();
+			this.fetching = true;
+
+			(this as any).api('users/lists/show', {
+				listId: this.$route.params.list
+			}).then(list => {
+				this.list = list;
+				this.fetching = false;
+
+				Progress.done();
+			});
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+main
+	width 100%
+	max-width 680px
+	margin 0 auto
+	padding 8px
+
+	@media (min-width 500px)
+		padding 16px
+
+	@media (min-width 600px)
+		padding 32px
+
+</style>

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

@@ -0,0 +1,68 @@
+<template>
+<mk-ui>
+	<span slot="header">%fa:list%%i18n:@title%</span>
+	<template slot="func"><button @click="fn">%fa:plus%</button></template>
+
+	<main>
+		<ul>
+			<li v-for="list in lists" :key="list.id"><router-link :to="`/i/lists/${list.id}`">{{ list.title }}</router-link></li>
+		</ul>
+	</main>
+</mk-ui>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import Progress from '../../../common/scripts/loading';
+
+export default Vue.extend({
+	data() {
+		return {
+			fetching: true,
+			lists: []
+		};
+	},
+	mounted() {
+		document.title = 'Misskey | %i18n:@title%';
+
+		Progress.start();
+
+		(this as any).api('users/lists/list').then(lists => {
+			this.fetching = false;
+			this.lists = lists;
+
+			Progress.done();
+		});
+	},
+	methods: {
+		fn() {
+			(this as any).apis.input({
+				title: '%i18n:@enter-list-name%',
+			}).then(async title => {
+				const list = await (this as any).api('users/lists/create', {
+					title
+				});
+
+				this.$router.push('/i/lists/' + list.id);
+			});
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+main
+	width 100%
+	max-width 680px
+	margin 0 auto
+	padding 8px
+
+	@media (min-width 500px)
+		padding 16px
+
+	@media (min-width 600px)
+		padding 32px
+
+</style>

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

@@ -9,6 +9,7 @@
 			<header>
 				<select v-model="widgetAdderSelected">
 					<option value="profile">%i18n:common.widgets.profile%</option>
+					<option value="analog-clock">%i18n:common.widgets.analog-clock%</option>
 					<option value="calendar">%i18n:common.widgets.calendar%</option>
 					<option value="activity">%i18n:common.widgets.activity%</option>
 					<option value="rss">%i18n:common.widgets.rss%</option>

src/models/note.ts

@@ -77,6 +77,7 @@ export type INote = {
 		host: string;
 		inbox?: string;
 	};
+	_replyIds?: mongo.ObjectID[];
 };
 
 /**

src/models/user.ts

@@ -84,6 +84,8 @@ export interface ILocalUser extends IUserBase {
 	twoFactorTempSecret?: string;
 	clientSettings: any;
 	settings: any;
+	hasUnreadNotification: boolean;
+	hasUnreadMessagingMessage: boolean;
 }
 
 export interface IRemoteUser extends IUserBase {
@@ -387,8 +389,9 @@ export const pack = (
 	if (!meId || !meId.equals(_user.id) || !opts.detail) {
 		delete _user.avatarId;
 		delete _user.bannerId;
-
 		delete _user.driveCapacity;
+		delete _user.hasUnreadMessagingMessage;
+		delete _user.hasUnreadNotification;
 	}
 
 	if (meId && !meId.equals(_user.id)) {

src/publishers/notify.ts

@@ -3,6 +3,7 @@ import Notification from '../models/notification';
 import Mute from '../models/mute';
 import { pack } from '../models/notification';
 import stream from './stream';
+import User from '../models/user';
 
 export default (
 	notifiee: mongo.ObjectID,
@@ -29,6 +30,13 @@ export default (
 	stream(notifiee, 'notification',
 		await pack(notification));
 
+	// Update flag
+	User.update({ _id: notifiee }, {
+		$set: {
+			hasUnreadNotification: true
+		}
+	});
+
 	// 3秒経っても(今回作成した)通知が既読にならなかったら「未読の通知がありますよ」イベントを発行する
 	setTimeout(async () => {
 		const fresh = await Notification.findOne({ _id: notification._id }, { isRead: true });

src/server/api/common/read-messaging-message.ts

@@ -4,6 +4,7 @@ import { IMessagingMessage as IMessage } from '../../../models/messaging-message
 import publishUserStream from '../../../publishers/stream';
 import { publishMessagingStream } from '../../../publishers/stream';
 import { publishMessagingIndexStream } from '../../../publishers/stream';
+import User from '../../../models/user';
 
 /**
  * Mark as read message(s)
@@ -62,6 +63,13 @@ export default (
 		});
 
 	if (count == 0) {
+		// Update flag
+		User.update({ _id: userId }, {
+			$set: {
+				hasUnreadMessagingMessage: false
+			}
+		});
+
 		// 全ての(いままで未読だった)自分宛てのメッセージを(これで)読みましたよというイベントを発行
 		publishUserStream(userId, 'read_all_messaging_messages');
 	}

src/server/api/common/read-notification.ts

@@ -2,6 +2,7 @@ import * as mongo from 'mongodb';
 import { default as Notification, INotification } from '../../../models/notification';
 import publishUserStream from '../../../publishers/stream';
 import Mute from '../../../models/mute';
+import User from '../../../models/user';
 
 /**
  * Mark as read notification(s)
@@ -57,6 +58,13 @@ export default (
 		});
 
 	if (count == 0) {
+		// Update flag
+		User.update({ _id: userId }, {
+			$set: {
+				hasUnreadNotification: false
+			}
+		});
+
 		// 全ての(いままで未読だった)通知を(これで)読みましたよというイベントを発行
 		publishUserStream(userId, 'read_all_notifications');
 	}

src/server/api/endpoints.ts

@@ -279,11 +279,6 @@ const endpoints: Endpoint[] = [
 		kind: 'account/read'
 	},
 
-	{
-		name: 'notifications/get_unread_count',
-		withCredential: true,
-		kind: 'notification-read'
-	},
 	{
 		name: 'notifications/delete',
 		withCredential: true,
@@ -515,7 +510,6 @@ const endpoints: Endpoint[] = [
 	},
 	{
 		name: 'notes/local-timeline',
-		withCredential: true,
 		limit: {
 			duration: ms('10minutes'),
 			max: 100
@@ -523,7 +517,6 @@ const endpoints: Endpoint[] = [
 	},
 	{
 		name: 'notes/global-timeline',
-		withCredential: true,
 		limit: {
 			duration: ms('10minutes'),
 			max: 100
@@ -612,11 +605,6 @@ const endpoints: Endpoint[] = [
 		withCredential: true,
 		kind: 'messaging-read'
 	},
-	{
-		name: 'messaging/unread',
-		withCredential: true,
-		kind: 'messaging-read'
-	},
 	{
 		name: 'messaging/messages',
 		withCredential: true,

src/server/api/endpoints/messaging/messages.ts

@@ -1,6 +1,3 @@
-/**
- * Module dependencies
- */
 import $ from 'cafy'; import ID from '../../../../cafy-id';
 import Message from '../../../../models/messaging-message';
 import User from '../../../../models/user';
@@ -9,10 +6,6 @@ import read from '../../common/read-messaging-message';
 
 /**
  * Get messages
- *
- * @param {any} params
- * @param {any} user
- * @return {Promise<any>}
  */
 module.exports = (params, user) => new Promise(async (res, rej) => {
 	// Get 'userId' parameter

src/server/api/endpoints/messaging/messages/create.ts

@@ -91,6 +91,13 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	publishMessagingIndexStream(message.recipientId, 'message', messageObj);
 	publishUserStream(message.recipientId, 'messaging_message', messageObj);
 
+	// Update flag
+	User.update({ _id: recipient._id }, {
+		$set: {
+			hasUnreadMessagingMessage: true
+		}
+	});
+
 	// 3秒経っても(今回作成した)メッセージが既読にならなかったら「未読のメッセージがありますよ」イベントを発行する
 	setTimeout(async () => {
 		const freshMessage = await Message.findOne({ _id: message._id }, { isRead: true });

src/server/api/endpoints/messaging/unread.ts

@@ -1,29 +0,0 @@
-/**
- * Module dependencies
- */
-import Message from '../../../../models/messaging-message';
-import Mute from '../../../../models/mute';
-
-/**
- * Get count of unread messages
- */
-module.exports = (params, user) => new Promise(async (res, rej) => {
-	const mute = await Mute.find({
-		muterId: user._id,
-		deletedAt: { $exists: false }
-	});
-	const mutedUserIds = mute.map(m => m.muteeId);
-
-	const count = await Message
-		.count({
-			userId: {
-				$nin: mutedUserIds
-			},
-			recipientId: user._id,
-			isRead: false
-		});
-
-	res({
-		count: count
-	});
-});

src/server/api/endpoints/notes.ts

@@ -53,7 +53,9 @@ module.exports = (params) => new Promise(async (res, rej) => {
 	const sort = {
 		_id: -1
 	};
-	const query = {} as any;
+	const query = {
+		visibility: 'public'
+	} as any;
 	if (sinceId) {
 		sort._id = 1;
 		query._id = {

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

@@ -9,7 +9,7 @@ import { pack } from '../../../../models/note';
 /**
  * Get timeline of global
  */
-module.exports = async (params, user, app) => {
+module.exports = async (params, user) => {
 	// Get 'limit' parameter
 	const [limit = 10, limitErr] = $.num.optional().range(1, 100).get(params.limit);
 	if (limitErr) throw 'invalid limit param';
@@ -36,9 +36,9 @@ module.exports = async (params, user, app) => {
 	}
 
 	// ミュートしているユーザーを取得
-	const mutedUserIds = (await Mute.find({
+	const mutedUserIds = user ? (await Mute.find({
 		muterId: user._id
-	})).map(m => m.muteeId);
+	})).map(m => m.muteeId) : null;
 
 	//#region Construct query
 	const sort = {
@@ -46,18 +46,24 @@ module.exports = async (params, user, app) => {
 	};
 
 	const query = {
-		// mute
-		userId: {
-			$nin: mutedUserIds
-		},
-		'_reply.userId': {
-			$nin: mutedUserIds
-		},
-		'_renote.userId': {
-			$nin: mutedUserIds
-		}
+		// public only
+		visibility: 'public'
 	} as any;
 
+	if (mutedUserIds && mutedUserIds.length > 0) {
+		query.userId = {
+			$nin: mutedUserIds
+		};
+
+		query['_reply.userId'] = {
+			$nin: mutedUserIds
+		};
+
+		query['_renote.userId'] = {
+			$nin: mutedUserIds
+		};
+	}
+
 	if (sinceId) {
 		sort._id = 1;
 		query._id = {

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

@@ -9,7 +9,7 @@ import { pack } from '../../../../models/note';
 /**
  * Get timeline of local
  */
-module.exports = async (params, user, app) => {
+module.exports = async (params, user) => {
 	// Get 'limit' parameter
 	const [limit = 10, limitErr] = $.num.optional().range(1, 100).get(params.limit);
 	if (limitErr) throw 'invalid limit param';
@@ -36,9 +36,9 @@ module.exports = async (params, user, app) => {
 	}
 
 	// ミュートしているユーザーを取得
-	const mutedUserIds = (await Mute.find({
+	const mutedUserIds = user ? (await Mute.find({
 		muterId: user._id
-	})).map(m => m.muteeId);
+	})).map(m => m.muteeId) : null;
 
 	//#region Construct query
 	const sort = {
@@ -46,21 +46,27 @@ module.exports = async (params, user, app) => {
 	};
 
 	const query = {
-		// mute
-		userId: {
-			$nin: mutedUserIds
-		},
-		'_reply.userId': {
-			$nin: mutedUserIds
-		},
-		'_renote.userId': {
-			$nin: mutedUserIds
-		},
+		// public only
+		visibility: 'public',
 
 		// local
 		'_user.host': null
 	} as any;
 
+	if (mutedUserIds && mutedUserIds.length > 0) {
+		query.userId = {
+			$nin: mutedUserIds
+		};
+
+		query['_reply.userId'] = {
+			$nin: mutedUserIds
+		};
+
+		query['_renote.userId'] = {
+			$nin: mutedUserIds
+		};
+	}
+
 	if (sinceId) {
 		sort._id = 1;
 		query._id = {

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

@@ -1,15 +1,8 @@
-/**
- * Module dependencies
- */
 import $ from 'cafy'; import ID from '../../../../cafy-id';
 import Note, { pack } from '../../../../models/note';
 
 /**
- * Show a replies of a note
- *
- * @param {any} params
- * @param {any} user
- * @return {Promise<any>}
+ * Get replies of a note
  */
 module.exports = (params, user) => new Promise(async (res, rej) => {
 	// Get 'noteId' parameter
@@ -24,10 +17,6 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	const [offset = 0, offsetErr] = $.num.optional().min(0).get(params.offset);
 	if (offsetErr) return rej('invalid offset param');
 
-	// Get 'sort' parameter
-	const [sort = 'desc', sortError] = $.str.optional().or('desc asc').get(params.sort);
-	if (sortError) return rej('invalid sort param');
-
 	// Lookup note
 	const note = await Note.findOne({
 		_id: noteId
@@ -37,17 +26,8 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 		return rej('note not found');
 	}
 
-	// Issue query
-	const replies = await Note
-		.find({ replyId: note._id }, {
-			limit: limit,
-			skip: offset,
-			sort: {
-				_id: sort == 'asc' ? 1 : -1
-			}
-		});
+	const ids = (note._replyIds || []).slice(offset, offset + limit);
 
 	// Serialize
-	res(await Promise.all(replies.map(async note =>
-		await pack(note, user))));
+	res(await Promise.all(ids.map(id => pack(id, user))));
 });

src/server/api/endpoints/notifications/get_unread_count.ts

@@ -1,28 +0,0 @@
-/**
- * Module dependencies
- */
-import Notification from '../../../../models/notification';
-import Mute from '../../../../models/mute';
-
-/**
- * Get count of unread notifications
- */
-module.exports = (params, user) => new Promise(async (res, rej) => {
-	const mute = await Mute.find({
-		muterId: user._id
-	});
-	const mutedUserIds = mute.map(m => m.muteeId);
-
-	const count = await Notification
-		.count({
-			notifieeId: user._id,
-			notifierId: {
-				$nin: mutedUserIds
-			},
-			isRead: false
-		});
-
-	res({
-		count: count
-	});
-});

src/server/api/endpoints/notifications/mark_as_read_all.ts

@@ -1,8 +1,6 @@
-/**
- * Module dependencies
- */
 import Notification from '../../../../models/notification';
 import event from '../../../../publishers/stream';
+import User from '../../../../models/user';
 
 /**
  * Mark as read all notifications
@@ -23,6 +21,13 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	// Response
 	res();
 
+	// Update flag
+	User.update({ _id: user._id }, {
+		$set: {
+			hasUnreadNotification: false
+		}
+	});
+
 	// 全ての通知を読みましたよというイベントを発行
 	event(user._id, 'read_all_notifications');
 });

src/server/api/service/github.ts

@@ -25,7 +25,7 @@ const post = async text => {
 		}
 	}
 
-	createNote(bot, { text });
+	createNote(bot, { text, visibility: 'home' });
 };
 
 // Init router

src/services/note/create.ts

@@ -172,6 +172,24 @@ export default async (user: IUser, data: {
 		}
 	});
 
+	if (data.reply) {
+		Note.update({ _id: data.reply._id }, {
+			$push: {
+				_replyIds: note._id
+			}
+		});
+	}
+
+	const isQuote = data.renote && (data.text || data.poll || data.media);
+
+	if (isQuote) {
+		Note.update({ _id: data.renote._id }, {
+			$push: {
+				_quoteIds: note._id
+			}
+		});
+	}
+
 	// Serialize
 	const noteObj = await pack(note);