2.25.2

New Crowdin translations

docs/setup.en.md

@@ -47,7 +47,14 @@ You need to generate config file via `npm run config` command.
 
 *5.* Build Misskey
 ----------------------------------------------------------------
-We need to use `node-gyp` to build the `crypto` module.
+
+Build misskey with the following:
+
+`npm run build`
+
+If you're on Debian, you will need to install the `build-essential` package.
+
+If you're still encountering errors about some modules, use node-gyp:
 
 1. `npm install -g node-gyp`
 2. `node-gyp configure`

locales/de.yml

@@ -36,38 +36,39 @@ common:
     confused: "Verwirrt"
     pudding: "Pudding"
   note-placeholders:
-    a: "今どうしてる？"
+    a: "Was machst du gerade?"
-    b: "何かありましたか？"
+    b: "Was ist so passiert?"
-    c: "何をお考えですか？"
+    c: "Was geht dir durch den Kopf?"
-    d: "言いたいことは？"
+    d: "Willst du etwas sagen?"
-    e: "ここに書いてください"
+    e: "Schreib hier etwas!"
-    f: "あなたが書くのを待っています..."
+    f: "Warte darauf, das du schreibst."
   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:
-    profile: "プロフィール"
+    analog-clock: "Analoge Uhr"
-    calendar: "カレンダー"
+    profile: "Profil"
-    timemachine: "カレンダー(タイムマシン)"
+    calendar: "Kalender"
-    activity: "アクティビティ"
+    timemachine: "Kalender (Zeitmaschiene)"
-    rss: "RSSリーダー"
+    activity: "Aktivitäten"
-    memo: "メモ"
+    rss: "RSS Leser"
-    trends: "トレンド"
+    memo: "Notizen"
-    photo-stream: "フォトストリーム"
+    trends: "Trends"
-    slideshow: "スライドショー"
+    photo-stream: "Bilder"
-    version: "バージョン"
+    slideshow: "Diashow"
+    version: "Version"
     broadcast: "ブロードキャスト"
-    notifications: "通知"
+    notifications: "Benachrichtigungen"
-    users: "おすすめユーザー"
+    users: "Empfohlene Benutzer"
-    polls: "投票"
+    polls: "Umfragen"
     post-form: "投稿フォーム"
-    messaging: "メッセージ"
+    messaging: "Nachrichten"
-    server: "サーバー情報"
+    server: "Server-Info"
-    donation: "寄付のお願い"
+    donation: "Spenden"
-    nav: "ナビゲーション"
+    nav: "Navigation"
-    tips: "ヒント"
+    tips: "Tipps"
 common/views/components/connect-failed.vue:
   title: "Verbindung zum Server ist fehlgeschlagen"
   description: "Es gibt entweder ein Problem mit deiner Internetverbindung, der Server ist nicht erreichbar oder wird gerade gewartet. Bitte versuche es später noch einmal."
@@ -122,8 +123,8 @@ common/views/components/nav.vue:
 common/views/components/note-menu.vue:
   favorite: "Diese Anmerkung favorisieren"
   pin: "An die Profilseite pinnen"
-  delete: "削除"
+  delete: "Löschen"
-  delete-confirm: "この投稿を削除しますか？"
+  delete-confirm: "Diesen Post löschen?"
   remote: "Auf Quelle anzeigen"
 common/views/components/poll.vue:
   vote-to: "Stimme für '{}'"
@@ -184,14 +185,14 @@ common/views/components/twitter-setting.vue:
 common/views/components/uploader.vue:
   waiting: "Warten"
 common/views/components/visibility-chooser.vue:
-  public: "公開"
+  public: "Öffentlich"
-  home: "ホーム"
+  home: "Home"
   home-desc: "ホームタイムラインにのみ公開"
-  followers: "フォロワー"
+  followers: "Folgende"
-  followers-desc: "自分のフォロワーにのみ公開"
+  followers-desc: "Nur für diejenigen sichtbar, die dir folgen"
-  specified: "ダイレクト"
+  specified: "Direkt"
-  specified-desc: "指定したユーザーにのみ公開"
+  specified-desc: "Poste nur für bestimmte Benutzer"
-  private: "非公開"
+  private: "Privat"
 common/views/widgets/broadcast.vue:
   fetching: "Laden"
   no-broadcasts: "Keine Broadcasts"
@@ -207,9 +208,9 @@ common/views/widgets/server.vue:
   title: "Serverinformationen"
   toggle: "Sicht umschalten"
 common/views/widgets/memo.vue:
-  title: "メモ"
+  title: "Notizen"
-  memo: "ここに書いて！"
+  memo: "Schreib hier!"
-  save: "保存"
+  save: "Speichern"
 desktop/views/components/activity.chart.vue:
   total: "Schwarz ... komplett"
   notes: "Blau ... Hinweise"
@@ -248,29 +249,29 @@ desktop/views/components/drive.file.vue:
     copy-url: "URL kopieren"
     download: "Download"
     else-files: "その他..."
-    set-as-avatar: "アイコンに設定"
+    set-as-avatar: "Als Avatar festlegen"
-    set-as-banner: "バナーに設定"
+    set-as-banner: "Setze als Banner"
-    open-in-app: "アプリで開く"
+    open-in-app: "In der App öffnen"
-    add-app: "アプリを追加"
+    add-app: "App hinzufügen"
-    rename-file: "ファイル名の変更"
+    rename-file: "Datei umbennen"
-    input-new-file-name: "新しいファイル名を入力してください"
+    input-new-file-name: "Geben Sie den neuen Dateinamen an"
-    copied: "コピー完了"
+    copied: "Kopieren erfolgreich"
-    copied-url-to-clipboard: "URLをクリップボードにコピーしました"
+    copied-url-to-clipboard: "URL wurde in die Zwischenablage kopiert"
 desktop/views/components/drive.folder.vue:
-  unable-to-process: "操作を完了できません"
+  unable-to-process: "Der Vorgang konnte nicht beendet werden"
-  circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。"
+  circular-reference-detected: "Das Zielverzeichnis ist ein Unterverzeichnis des Verzeichnisses welches du verschieben möchtest"
-  unhandled-error: "不明なエラー"
+  unhandled-error: "Unbekannter Fehler"
   contextmenu:
-    move-to-this-folder: "このフォルダへ移動"
+    move-to-this-folder: "Verschiebe in diesen Ordner"
-    show-in-new-window: "新しいウィンドウで表示"
+    show-in-new-window: "In einem neuen Fenster anzeigen"
-    rename: "名前を変更"
+    rename: "Umbenennen"
-    rename-folder: "フォルダ名の変更"
+    rename-folder: "Ordner umbenennen"
-    input-new-folder-name: "新しいフォルダ名を入力してください"
+    input-new-folder-name: "Namen für neuen Ordner eingeben"
 desktop/views/components/drive.nav-folder.vue:
-  drive: "ドライブ"
+  drive: "Laufwerk"
 desktop/views/components/drive.vue:
-  search: "検索"
+  search: "Suchen"
-  load-more: "もっと読み込む"
+  load-more: "Mehr laden"
   empty-draghover: "Herzlich Willkommen!"
   empty-drive: "Dein Speicher ist leer"
   empty-drive-description: "Du kannst rechts klicken und \"Datei hochladen\" auswählen oder eine Datei per Drag and Drop auf das Fenster ziehen."
@@ -289,12 +290,14 @@ desktop/views/components/drive.vue:
     upload: "Eine Datei hochladen"
     url-upload: "Von einer URL hochladen"
 desktop/views/components/follow-button.vue:
-  unfollow: "フォロー解除"
+  unfollow: "フォロー中"
-  follow: "フォローする"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
   followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
-  empty: "フォロワーはいないようです。"
+  empty: "Dir scheint niemand zu folgen."
 desktop/views/components/following-window.vue:
   following: "{} のフォロー"
 desktop/views/components/following.vue:
@@ -326,9 +329,6 @@ 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"
@@ -478,7 +478,7 @@ desktop/views/components/settings.api.vue:
   regenerate-token: "トークンを再生成"
   token: "Token:"
   enter-password: "パスワードを入力してください"
-desktop/views/components/settings.app.vue:
+desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
 desktop/views/components/settings.mute.vue:
   no-users: "ミュートしているユーザーはいません"
@@ -516,6 +516,7 @@ desktop/views/components/ui.header.account.vue:
   drive: "Speicher"
   favorites: "Favoriten"
   lists: "Listen"
+  follow-requests: "フォロー申請"
   customize: "Anpassen"
   settings: "Einstellungen"
   signout: "Ausloggen"
@@ -530,7 +531,12 @@ desktop/views/components/ui.header.post.vue:
   post: "Einen neuen Post erstellen"
 desktop/views/components/ui.header.search.vue:
   placeholder: "Suchen"
+desktop/views/components/received-follow-requests-window.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 desktop/views/components/user-lists-window.vue:
+  title: "リスト"
   create-list: "リストを作成"
 desktop/views/components/user-preview.vue:
   notes: "投稿"
@@ -655,8 +661,10 @@ mobile/views/components/drive.file-detail.vue:
   hash: "ハッシュ (md5)"
   exif: "EXIF"
 mobile/views/components/follow-button.vue:
+  unfollow: "フォロー中"
   follow: "フォロー"
-  unfollow: "フォロー解除"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 mobile/views/components/friends-maker.vue:
   title: "気になるユーザーをフォロー"
   empty: "おすすめのユーザーは見つかりませんでした。"
@@ -696,7 +704,7 @@ mobile/views/components/post-form.vue:
   submit: "投稿"
   reply: "返信"
   renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
   reply-placeholder: "この投稿への返信..."
   cw-placeholder: "内容への注釈 (オプション)"
   location-alert: "お使いの端末は位置情報に対応していません"
@@ -711,11 +719,17 @@ mobile/views/components/timeline.vue:
   empty: "投稿がありません"
   load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
   notifications: "通知"
   messaging: "メッセージ"
+  follow-requests: "フォロー申請"
   search: "検索"
   drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
   settings: "設定"
   about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
@@ -726,8 +740,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:
@@ -740,6 +760,10 @@ mobile/views/pages/messaging.vue:
   messaging: "メッセージ"
 mobile/views/pages/messaging-room.vue:
   messaging: "メッセージ"
+mobile/views/pages/received-follow-requests.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 mobile/views/pages/note.vue:
   title: "投稿"
   prev: "前の投稿"

locales/en.yml

@@ -5,7 +5,7 @@ meta:
 common:
   misskey: "A planet of fediverse"
   about-title: "A ⭐ of fediverse."
-  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
+  about: "Thanks for finding Misskey. Misskey is a <b>decentralized microblogging platform</b> born on Earth. Since it exists within Fediverse (a universe where various social media platforms are organized) it is mutually linked with other social media platforms. Why don't you take a short break from the hustle and bustle of the city, and dive into a new Internet?"
   time:
     unknown: "unknown"
     future: "future"
@@ -45,9 +45,10 @@ common:
   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."
+  update-available: "A new version of Misskey is now available({newer}, the current version is {current}). Reload the page to apply updates."
-  my-token-regenerated: "Your token has been generated. You will now get logged out."
+  my-token-regenerated: "Your token has been renewed so you will be signed out."
   widgets:
+    analog-clock: "Analog clock"
     profile: "Profile"
     calendar: "Calendar"
     timemachine: "Calendar (Time Machine)"
@@ -81,9 +82,9 @@ common/views/components/connect-failed.troubleshooter.vue:
   checking-internet: "Checking internet connection"
   server: "Server connection"
   checking-server: "Checking server connection"
-  finding: "Finding a problem"
+  finding: "Searching for issues"
-  no-network: "There is no Network connection"
+  no-network: "No connection"
-  no-network-desc: "Please make sure you are connected to the Network."
+  no-network-desc: "Please make sure you are connected to the network."
   no-internet: "There is no Internet connection"
   no-internet-desc: "Please make sure you are connected to the Internet."
   no-server: "Unable to connect to the Misskey server"
@@ -93,19 +94,19 @@ common/views/components/connect-failed.troubleshooter.vue:
   flush: "Clean cache"
   set-version: "Specify version"
 common/views/components/messaging.vue:
-  search-user: "Find an user"
+  search-user: "Find a user"
   you: "You"
   no-history: "No history"
 common/views/components/messaging-room.vue:
-  empty: "No conversations"
+  empty: "You haven't messaged this user"
-  more: "More"
+  more: "Read more"
   no-history: "There is no more history"
   resize-form: "Drag to resize"
   new-message: "New message"
 common/views/components/messaging-room.form.vue:
   input-message-here: "Enter message here"
   send: "Send"
-  attach-from-local: "Attach files from your pc"
+  attach-from-local: "Attach files from your PC"
   attach-from-drive: "Attach files from your Drive"
 common/views/components/messaging-room.message.vue:
   is-read: "Read"
@@ -137,7 +138,7 @@ common/views/components/poll-editor.vue:
   choice-n: "Choice {}"
   remove: "Remove this choice"
   add: "+ Add a choice"
-  destroy: "Destroy this poll"
+  destroy: "Cancel this poll"
 common/views/components/reaction-picker.vue:
   choose-reaction: "Choose a reaction"
 common/views/components/signin.vue:
@@ -157,10 +158,10 @@ common/views/components/signup.vue:
   too-long: "Please enter up to 20 characters."
   password: "Password"
   password-placeholder: "We recommend more than 8 characters."
-  weak-password: "Weak"
+  weak-password: "Weak password"
-  normal-password: "So so"
+  normal-password: "Fair password"
-  strong-password: "Strong"
+  strong-password: "Strong password"
-  retype: "Type again"
+  retype: "Re-enter"
   retype-placeholder: "Confirm your password"
   password-matched: "OK"
   password-not-matched: "Doesn't match"
@@ -177,9 +178,9 @@ common/views/components/stream-indicator.vue:
 common/views/components/twitter-setting.vue:
   description: "If you connect your Twitter account to your Misskey account, you will be able to see your Twitter account information on your profile and you can sign-in using Twitter."
   connected-to: "You are connected to this Twitter account"
-  detail: "Detail..."
+  detail: "Details..."
   reconnect: "Reconnect"
-  connect: "Link your twitter account"
+  connect: "Link your Twitter account"
   disconnect: "Disconnect"
 common/views/components/uploader.vue:
   waiting: "Waiting"
@@ -199,7 +200,7 @@ common/views/widgets/broadcast.vue:
   next: "Next"
 common/views/widgets/donation.vue:
   title: "Donation"
-  text: "To keep Misskey up and running we spend money for our domain name, servers and so on.. We don't get any money from it, and we would really appreciate it if you could donate. If you're interested contact {}. Thank you for your contribution!"
+  text: "To keep Misskey up and running we spend money for our domain name, servers and so on. Since we don't get money from advertisements, we count on donations from all of you. If you're interested contact {}. Thank you for your contribution!"
 common/views/widgets/photo-stream.vue:
   title: "Photostream"
   no-photos: "No photos"
@@ -222,7 +223,7 @@ desktop/views/components/calendar.vue:
   title: "{1} / {2}"
   prev: "Previous month"
   next: "Next month"
-  go: "Click to naviguate"
+  go: "Click to navigate"
 desktop/views/components/choose-file-from-drive-window.vue:
   choose-file: "Choosing files"
   upload: "Upload files from your PC"
@@ -289,19 +290,21 @@ desktop/views/components/drive.vue:
     upload: "Upload a file"
     url-upload: "Upload from a URL"
 desktop/views/components/follow-button.vue:
-  unfollow: "Unfollow"
+  unfollow: "Following"
   follow: "Follow"
+  request-pending: "フォロー許可待ち"
+  follow-request: "Follow request"
 desktop/views/components/followers-window.vue:
-  followers: "Followers of {}"
+  followers: "{}'s followers"
 desktop/views/components/followers.vue:
-  empty: "Seems that you don’t have any followers."
+  empty: "Seems like you don’t have any followers."
 desktop/views/components/following-window.vue:
-  following: "Following of {}"
+  following: "Following {}"
 desktop/views/components/following.vue:
   empty: "You don’t follow anyone."
 desktop/views/components/friends-maker.vue:
   title: "Recommended users:"
-  empty: "Similar users weren’t found."
+  empty: "Couldn't find any recommended users."
   fetching: "Loading…"
   refresh: "More"
   close: "Close"
@@ -322,19 +325,16 @@ desktop/views/components/note-detail.vue:
   more: "Load more conversations"
   private: "this post is private"
   deleted: "this post has been deleted"
-  reposted-by: "Renoted by {}"
+  reposted-by: "Reposted by {}"
   location: "Location"
-  renote: "Renote"
+  renote: "Repost"
   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"
+  renote: "Repost"
   add-reaction: "Add a reaction"
-  detail: "Show detail"
+  detail: "Show details"
   private: "this post is private"
   deleted: "this post has been deleted"
 desktop/views/components/notes.vue:
@@ -348,20 +348,20 @@ desktop/views/components/post-form.vue:
   quote-placeholder: "Quote this note..."
   submit: "Post"
   reply: "Reply"
-  renote: "Renote"
+  renote: "Repost"
   posted: "Posted!"
   replied: "Replied!"
   reposted: "Reposted!"
   note-failed: "Failed to note"
   reply-failed: "Failed to reply"
-  renote-failed: "Failed to renote"
+  renote-failed: "Failed to repost"
   posting: "Posting"
-  attach-media-from-local: "Attach media from your pc"
+  attach-media-from-local: "Attach media from your PC"
   attach-media-from-drive: "Attach media from your Drive"
   attach-cancel: "Cancel attachment"
   insert-a-kao: "v(‘ω’)v"
   create-poll: "Create a poll"
-  text-remain: "{} chars remaining"
+  text-remain: "{} characters remaining"
 desktop/views/components/post-form-window.vue:
   note: "New note"
   reply: "Reply"
@@ -372,12 +372,12 @@ desktop/views/components/progress-dialog.vue:
 desktop/views/components/renote-form.vue:
   quote: "Quote..."
   cancel: "Cancel"
-  renote: "Renote"
+  renote: "Repost"
   reposting: "Reposting..."
   success: "Reposted!"
-  failure: "Failed to Renote"
+  failure: "Repost failed"
 desktop/views/components/renote-form-window.vue:
-  title: "Are you sure you want to renote this note?"
+  title: "Are you sure you want to repost this?"
 desktop/views/components/settings-window.vue:
   settings: "Settings"
 desktop/views/components/settings.vue:
@@ -407,22 +407,22 @@ desktop/views/components/settings.vue:
   gradient-window-header: "Use gradients on window headers"
   post-form-on-timeline: "Display post form at the top of the timeline"
   show-reply-target: "Display reply target"
-  show-my-renotes: "Show my renote in the timeline"
+  show-my-renotes: "Show my reposts in the timeline"
-  show-renoted-my-notes: "Show renoted my post in the timeline"
+  show-renoted-my-notes: "Show my posts that have been shared in the timeline"
   show-maps: "Show the map"
-  show-maps-desc: "Show the map of the location attached to the post."
+  show-maps-desc: "Automatically show the map of the location attached to the post."
   sound: "Sound"
   enable-sounds: "Enable sound"
-  enable-sounds-desc: "Play a sound when you received a post/message. This setting is stored in the browser."
+  enable-sounds-desc: "Play a sound when you receive a post/message. This setting is stored in the browser."
   volume: "Volume"
   test: "Test"
   mobile: "Mobile"
-  disable-via-mobile: "Not mark the post as 'from mobile'"
+  disable-via-mobile: "Don't mark the post as 'from mobile'"
   language: "Language"
   pick-language: "Select a language"
   recommended: "Recommended"
   auto: "Auto"
-  specify-language: "Specify the language"
+  specify-language: "Specify language"
   language-desc: "You need to reload the page for the changes to take effect."
   cache: "Cache"
   clean-cache: "Cleanup"
@@ -440,11 +440,11 @@ desktop/views/components/settings.vue:
   do-update: "Check for update"
   update-settings: "Advanced settings"
   prevent-update: "Postpone updates (not recommended)"
-  prevent-update-desc: "You may reflect updates even if you select this setting. This setting is valid only this device."
+  prevent-update-desc: "Even if you turn this setting on updates may apply. This setting is valid only for this device."
   no-updates: "No updates available"
   no-updates-desc: "Your Misskey is up to date."
   update-available: "New version is available!"
-  update-available-desc: "To reload the page and updates are applied."
+  update-available-desc: "The updates will apply if you reload the page again."
   advanced-settings: "Advanced"
   debug-mode: "Enable the debug mode"
   debug-mode-desc: "This setting is stored in the browser."
@@ -478,8 +478,8 @@ desktop/views/components/settings.api.vue:
   regenerate-token: "Regenerate the token"
   token: "Token:"
   enter-password: "Please enter the password"
-desktop/views/components/settings.app.vue:
+desktop/views/components/settings.apps.vue:
-  no-apps: "No authorized apps"
+  no-apps: "No linked applications"
 desktop/views/components/settings.mute.vue:
   no-users: "No muted users"
 desktop/views/components/settings.password.vue:
@@ -516,6 +516,7 @@ desktop/views/components/ui.header.account.vue:
   drive: "Drive"
   favorites: "Favorites"
   lists: "Lists"
+  follow-requests: "Follow requests"
   customize: "Customize"
   settings: "Settings"
   signout: "Sign out"
@@ -530,7 +531,12 @@ desktop/views/components/ui.header.post.vue:
   post: "Compose new Post"
 desktop/views/components/ui.header.search.vue:
   placeholder: "Search"
+desktop/views/components/received-follow-requests-window.vue:
+  title: "Follow requests"
+  accept: "Accept"
+  reject: "Reject"
 desktop/views/components/user-lists-window.vue:
+  title: "User lists"
   create-list: "Create list"
 desktop/views/components/user-preview.vue:
   notes: "Posts"
@@ -635,13 +641,13 @@ mobile/views/components/drive.vue:
   load-more: "Load more"
   nothing-in-drive: "Nothing"
   folder-is-empty: "This folder is empty"
-  prompt: "何をしますか？(数字を入力してください): <1 → ファイルをアップロード | 2 → ファイルをURLでアップロード | 3 → フォルダ作成 | 4 → このフォルダ名を変更 | 5 → このフォルダを移動 | 6 → このフォルダを削除>"
+  prompt: "What do you want to do? (Please enter a number): <1 → Upload a file | 2 → Upload a file from a URL | 3 → Create a folder | 4 → Change this folder's name | 5 → Move this folder | 6 → Delete this folder>"
   deletion-alert: "Sorry! Deleting a folder is not yet implemented."
   folder-name: "Folder name"
-  root-rename-alert: "現在いる場所はルートで、フォルダではないため名前の変更はできません。名前を変更したいフォルダに移動してからやってください。"
+  root-rename-alert: "You're in the root; it can't be renamed because it's not a folder. Navigate to a folder you want to rename and try again."
-  root-move-alert: "現在いる場所はルートで、フォルダではないため移動はできません。移動したいフォルダに移動してからやってください。"
+  root-move-alert: "You're in the root; it can't be moved because it's not a folder. Navigate to a folder you want to move and try again."
   url-prompt: "URL of file you want to upload"
-  uploading: "アップロードをリクエストしました。アップロードが完了するまで時間がかかる場合があります。"
+  uploading: "Upload requested. It may take some time for the upload to complete."
 mobile/views/components/drive-file-detail.vue:
   rename: "Rename"
 mobile/views/components/drive-file-chooser.vue:
@@ -655,8 +661,10 @@ mobile/views/components/drive.file-detail.vue:
   hash: "Hash (md5)"
   exif: "EXIF"
 mobile/views/components/follow-button.vue:
+  unfollow: "Following"
   follow: "Follow"
-  unfollow: "Unfollow"
+  request-pending: "フォロー許可待ち"
+  follow-request: "Follow request"
 mobile/views/components/friends-maker.vue:
   title: "Let's follow users"
   empty: "Featured user was not found."
@@ -664,7 +672,7 @@ mobile/views/components/friends-maker.vue:
   refresh: "See more"
   close: "Close"
 mobile/views/components/note.vue:
-  reposted-by: "Renoted by {}"
+  reposted-by: "Reposted by {}"
   more: "See more"
   less: "Hide"
   private: "this post is private"
@@ -673,7 +681,7 @@ mobile/views/components/note.vue:
 mobile/views/components/note-detail.vue:
   reply: "Reply"
   reaction: "Reaction"
-  reposted-by: "Renoted by {}"
+  reposted-by: "Reposted by {}"
   private: "this post is private"
   deleted: "this post has been deleted"
   location: "Location"
@@ -695,11 +703,11 @@ mobile/views/components/post-form.vue:
   add-visible-user: "Add a user"
   submit: "Post"
   reply: "Reply"
-  renote: "Renote"
+  renote: "Repost"
-  renote-placeholder: "Quote this post. (optional)"
+  quote-placeholder: "Quote this post... (optional)"
   reply-placeholder: "Reply to this note..."
-  cw-placeholder: "内容への注釈 (オプション)"
+  cw-placeholder: "Comments about content (optional)"
-  location-alert: "お使いの端末は位置情報に対応していません"
+  location-alert: "Your device does not support location services"
   error: "Error"
   username-prompt: "Enter user name"
 mobile/views/components/sub-note-content.vue:
@@ -711,11 +719,17 @@ 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"
+  follow-requests: "Follow requests"
   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:
@@ -726,8 +740,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:
@@ -740,6 +760,10 @@ mobile/views/pages/messaging.vue:
   messaging: "Messaging"
 mobile/views/pages/messaging-room.vue:
   messaging: "Messaging"
+mobile/views/pages/received-follow-requests.vue:
+  title: "Follow requests"
+  accept: "Accept"
+  reject: "Reject"
 mobile/views/pages/note.vue:
   title: "Post"
   prev: "Previous note"
@@ -779,8 +803,8 @@ mobile/views/pages/settings.vue:
   circle-icons: "Use circle icons"
   timeline: "Timeline"
   show-reply-target: "Show reply target"
-  show-my-renotes: "Show my renotes"
+  show-my-renotes: "Show my reposts"
-  show-renoted-my-notes: "Show renoted my notes"
+  show-renoted-my-notes: "Show my reposted posts"
   post-style: "Post design"
   post-style-standard: "Standard"
   post-style-smart: "Smart"

locales/es.yml

@@ -48,6 +48,7 @@ common:
   update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   widgets:
+    analog-clock: "アナログ時計"
     profile: "プロフィール"
     calendar: "カレンダー"
     timemachine: "カレンダー(タイムマシン)"
@@ -289,8 +290,10 @@ desktop/views/components/drive.vue:
     upload: "ファイルをアップロード"
     url-upload: "URLからアップロード"
 desktop/views/components/follow-button.vue:
-  unfollow: "フォロー解除"
+  unfollow: "フォロー中"
-  follow: "フォローする"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
   followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -326,9 +329,6 @@ 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: "返信"
@@ -478,7 +478,7 @@ desktop/views/components/settings.api.vue:
   regenerate-token: "トークンを再生成"
   token: "Token:"
   enter-password: "パスワードを入力してください"
-desktop/views/components/settings.app.vue:
+desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
 desktop/views/components/settings.mute.vue:
   no-users: "ミュートしているユーザーはいません"
@@ -516,6 +516,7 @@ desktop/views/components/ui.header.account.vue:
   drive: "ドライブ"
   favorites: "お気に入り"
   lists: "リスト"
+  follow-requests: "フォロー申請"
   customize: "カスタマイズ"
   settings: "設定"
   signout: "サインアウト"
@@ -530,7 +531,12 @@ desktop/views/components/ui.header.post.vue:
   post: "新規投稿"
 desktop/views/components/ui.header.search.vue:
   placeholder: "検索"
+desktop/views/components/received-follow-requests-window.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 desktop/views/components/user-lists-window.vue:
+  title: "リスト"
   create-list: "リストを作成"
 desktop/views/components/user-preview.vue:
   notes: "投稿"
@@ -655,8 +661,10 @@ mobile/views/components/drive.file-detail.vue:
   hash: "ハッシュ (md5)"
   exif: "EXIF"
 mobile/views/components/follow-button.vue:
+  unfollow: "フォロー中"
   follow: "フォロー"
-  unfollow: "フォロー解除"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 mobile/views/components/friends-maker.vue:
   title: "気になるユーザーをフォロー"
   empty: "おすすめのユーザーは見つかりませんでした。"
@@ -696,7 +704,7 @@ mobile/views/components/post-form.vue:
   submit: "投稿"
   reply: "返信"
   renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
   reply-placeholder: "この投稿への返信..."
   cw-placeholder: "内容への注釈 (オプション)"
   location-alert: "お使いの端末は位置情報に対応していません"
@@ -711,11 +719,17 @@ mobile/views/components/timeline.vue:
   empty: "投稿がありません"
   load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
   notifications: "通知"
   messaging: "メッセージ"
+  follow-requests: "フォロー申請"
   search: "検索"
   drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
   settings: "設定"
   about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
@@ -726,8 +740,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:
@@ -740,6 +760,10 @@ mobile/views/pages/messaging.vue:
   messaging: "メッセージ"
 mobile/views/pages/messaging-room.vue:
   messaging: "メッセージ"
+mobile/views/pages/received-follow-requests.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 mobile/views/pages/note.vue:
   title: "投稿"
   prev: "前の投稿"

locales/fr.yml

@@ -48,6 +48,7 @@ common:
   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: "カレンダー(タイムマシン)"
@@ -289,8 +290,10 @@ desktop/views/components/drive.vue:
     upload: "Uploader un fichier"
     url-upload: "Uploader d'un URL"
 desktop/views/components/follow-button.vue:
-  unfollow: "フォロー解除"
+  unfollow: "フォロー中"
-  follow: "フォローする"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
   followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -326,9 +329,6 @@ 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"
@@ -478,8 +478,8 @@ desktop/views/components/settings.api.vue:
   regenerate-token: "Regenerer le token"
   token: "Token:"
   enter-password: "Veuillez entrer le mot de passe"
-desktop/views/components/settings.app.vue:
+desktop/views/components/settings.apps.vue:
-  no-apps: "Aucune application authorisée"
+  no-apps: "連携しているアプリケーションはありません"
 desktop/views/components/settings.mute.vue:
   no-users: "Aucun utilisateurs mis en sourdine"
 desktop/views/components/settings.password.vue:
@@ -516,6 +516,7 @@ desktop/views/components/ui.header.account.vue:
   drive: "Drive"
   favorites: "Favorites"
   lists: "リスト"
+  follow-requests: "フォロー申請"
   customize: "Modifications"
   settings: "Réglages"
   signout: "Déconnexion"
@@ -530,7 +531,12 @@ desktop/views/components/ui.header.post.vue:
   post: "Composer un nouveau post"
 desktop/views/components/ui.header.search.vue:
   placeholder: "Chercher"
+desktop/views/components/received-follow-requests-window.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 desktop/views/components/user-lists-window.vue:
+  title: "リスト"
   create-list: "リストを作成"
 desktop/views/components/user-preview.vue:
   notes: "投稿"
@@ -655,8 +661,10 @@ mobile/views/components/drive.file-detail.vue:
   hash: "Hash (md5)"
   exif: "EXIF"
 mobile/views/components/follow-button.vue:
+  unfollow: "フォロー中"
   follow: "Suivre"
-  unfollow: "Ne plus suivre"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 mobile/views/components/friends-maker.vue:
   title: "気になるユーザーをフォロー"
   empty: "おすすめのユーザーは見つかりませんでした。"
@@ -696,7 +704,7 @@ mobile/views/components/post-form.vue:
   submit: "Poster"
   reply: "返信"
   renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
   reply-placeholder: "Répondre à cette note"
   cw-placeholder: "内容への注釈 (オプション)"
   location-alert: "お使いの端末は位置情報に対応していません"
@@ -711,11 +719,17 @@ 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"
+  follow-requests: "フォロー申請"
   search: "Rechercher"
   drive: "Drive"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
   settings: "Réglages"
   about: "À propose de Misskey"
 mobile/views/components/user-timeline.vue:
@@ -726,8 +740,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:
@@ -740,6 +760,10 @@ mobile/views/pages/messaging.vue:
   messaging: "Messagerie"
 mobile/views/pages/messaging-room.vue:
   messaging: "Messagerie"
+mobile/views/pages/received-follow-requests.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 mobile/views/pages/note.vue:
   title: "Post"
   prev: "Note précedante"

locales/it.yml

@@ -48,6 +48,7 @@ common:
   update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   widgets:
+    analog-clock: "アナログ時計"
     profile: "プロフィール"
     calendar: "カレンダー"
     timemachine: "カレンダー(タイムマシン)"
@@ -289,8 +290,10 @@ desktop/views/components/drive.vue:
     upload: "ファイルをアップロード"
     url-upload: "URLからアップロード"
 desktop/views/components/follow-button.vue:
-  unfollow: "フォロー解除"
+  unfollow: "フォロー中"
-  follow: "フォローする"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
   followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -326,9 +329,6 @@ 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: "返信"
@@ -478,7 +478,7 @@ desktop/views/components/settings.api.vue:
   regenerate-token: "トークンを再生成"
   token: "Token:"
   enter-password: "パスワードを入力してください"
-desktop/views/components/settings.app.vue:
+desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
 desktop/views/components/settings.mute.vue:
   no-users: "ミュートしているユーザーはいません"
@@ -516,6 +516,7 @@ desktop/views/components/ui.header.account.vue:
   drive: "ドライブ"
   favorites: "お気に入り"
   lists: "リスト"
+  follow-requests: "フォロー申請"
   customize: "カスタマイズ"
   settings: "設定"
   signout: "サインアウト"
@@ -530,7 +531,12 @@ desktop/views/components/ui.header.post.vue:
   post: "新規投稿"
 desktop/views/components/ui.header.search.vue:
   placeholder: "検索"
+desktop/views/components/received-follow-requests-window.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 desktop/views/components/user-lists-window.vue:
+  title: "リスト"
   create-list: "リストを作成"
 desktop/views/components/user-preview.vue:
   notes: "投稿"
@@ -655,8 +661,10 @@ mobile/views/components/drive.file-detail.vue:
   hash: "ハッシュ (md5)"
   exif: "EXIF"
 mobile/views/components/follow-button.vue:
+  unfollow: "フォロー中"
   follow: "フォロー"
-  unfollow: "フォロー解除"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 mobile/views/components/friends-maker.vue:
   title: "気になるユーザーをフォロー"
   empty: "おすすめのユーザーは見つかりませんでした。"
@@ -696,7 +704,7 @@ mobile/views/components/post-form.vue:
   submit: "投稿"
   reply: "返信"
   renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
   reply-placeholder: "この投稿への返信..."
   cw-placeholder: "内容への注釈 (オプション)"
   location-alert: "お使いの端末は位置情報に対応していません"
@@ -711,11 +719,17 @@ mobile/views/components/timeline.vue:
   empty: "投稿がありません"
   load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
   notifications: "通知"
   messaging: "メッセージ"
+  follow-requests: "フォロー申請"
   search: "検索"
   drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
   settings: "設定"
   about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
@@ -726,8 +740,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:
@@ -740,6 +760,10 @@ mobile/views/pages/messaging.vue:
   messaging: "メッセージ"
 mobile/views/pages/messaging-room.vue:
   messaging: "メッセージ"
+mobile/views/pages/received-follow-requests.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 mobile/views/pages/note.vue:
   title: "投稿"
   prev: "前の投稿"

locales/ja.yml

@@ -54,6 +54,7 @@ common:
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
 
   widgets:
+    analog-clock: "アナログ時計"
     profile: "プロフィール"
     calendar: "カレンダー"
     timemachine: "カレンダー(タイムマシン)"
@@ -330,8 +331,10 @@ desktop/views/components/drive.vue:
     url-upload: "URLからアップロード"
 
 desktop/views/components/follow-button.vue:
-  unfollow: "フォロー解除"
+  following: "フォロー中"
-  follow: "フォローする"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 
 desktop/views/components/followers-window.vue:
   followers: "{} のフォロワー"
@@ -379,10 +382,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: "返信"
@@ -554,7 +553,7 @@ desktop/views/components/settings.api.vue:
   token: "Token:"
   enter-password: "パスワードを入力してください"
 
-desktop/views/components/settings.app.vue:
+desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
 
 desktop/views/components/settings.mute.vue:
@@ -599,6 +598,7 @@ desktop/views/components/ui.header.account.vue:
   drive: "ドライブ"
   favorites: "お気に入り"
   lists: "リスト"
+  follow-requests: "フォロー申請"
   customize: "カスタマイズ"
   settings: "設定"
   signout: "サインアウト"
@@ -618,7 +618,13 @@ desktop/views/components/ui.header.post.vue:
 desktop/views/components/ui.header.search.vue:
   placeholder: "検索"
 
+desktop/views/components/received-follow-requests-window.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
+
 desktop/views/components/user-lists-window.vue:
+  title: "リスト"
   create-list: "リストを作成"
 
 desktop/views/components/user-preview.vue:
@@ -774,8 +780,10 @@ mobile/views/components/drive.file-detail.vue:
   exif: "EXIF"
 
 mobile/views/components/follow-button.vue:
+  following: "フォロー中"
   follow: "フォロー"
-  unfollow: "フォロー解除"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 
 mobile/views/components/friends-maker.vue:
   title: "気になるユーザーをフォロー"
@@ -823,7 +831,7 @@ mobile/views/components/post-form.vue:
   submit: "投稿"
   reply: "返信"
   renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
   reply-placeholder: "この投稿への返信..."
   cw-placeholder: "内容への注釈 (オプション)"
   location-alert: "お使いの端末は位置情報に対応していません"
@@ -841,11 +849,17 @@ mobile/views/components/timeline.vue:
   load-more: "もっと"
 
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
   notifications: "通知"
   messaging: "メッセージ"
+  follow-requests: "フォロー申請"
   search: "検索"
   drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
   settings: "設定"
   about: "Misskeyについて"
 
@@ -859,8 +873,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: "{}のフォロワー"
@@ -879,6 +901,11 @@ mobile/views/pages/messaging.vue:
 mobile/views/pages/messaging-room.vue:
   messaging: "メッセージ"
 
+mobile/views/pages/received-follow-requests.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
+
 mobile/views/pages/note.vue:
   title: "投稿"
   prev: "前の投稿"

locales/ko.yml

@@ -48,6 +48,7 @@ common:
   update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   widgets:
+    analog-clock: "アナログ時計"
     profile: "プロフィール"
     calendar: "カレンダー"
     timemachine: "カレンダー(タイムマシン)"
@@ -289,8 +290,10 @@ desktop/views/components/drive.vue:
     upload: "ファイルをアップロード"
     url-upload: "URLからアップロード"
 desktop/views/components/follow-button.vue:
-  unfollow: "フォロー解除"
+  unfollow: "フォロー中"
-  follow: "フォローする"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
   followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -326,9 +329,6 @@ 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: "返信"
@@ -478,7 +478,7 @@ desktop/views/components/settings.api.vue:
   regenerate-token: "トークンを再生成"
   token: "Token:"
   enter-password: "パスワードを入力してください"
-desktop/views/components/settings.app.vue:
+desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
 desktop/views/components/settings.mute.vue:
   no-users: "ミュートしているユーザーはいません"
@@ -516,6 +516,7 @@ desktop/views/components/ui.header.account.vue:
   drive: "ドライブ"
   favorites: "お気に入り"
   lists: "リスト"
+  follow-requests: "フォロー申請"
   customize: "カスタマイズ"
   settings: "設定"
   signout: "サインアウト"
@@ -530,7 +531,12 @@ desktop/views/components/ui.header.post.vue:
   post: "新規投稿"
 desktop/views/components/ui.header.search.vue:
   placeholder: "検索"
+desktop/views/components/received-follow-requests-window.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 desktop/views/components/user-lists-window.vue:
+  title: "リスト"
   create-list: "リストを作成"
 desktop/views/components/user-preview.vue:
   notes: "投稿"
@@ -655,8 +661,10 @@ mobile/views/components/drive.file-detail.vue:
   hash: "ハッシュ (md5)"
   exif: "EXIF"
 mobile/views/components/follow-button.vue:
+  unfollow: "フォロー中"
   follow: "フォロー"
-  unfollow: "フォロー解除"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 mobile/views/components/friends-maker.vue:
   title: "気になるユーザーをフォロー"
   empty: "おすすめのユーザーは見つかりませんでした。"
@@ -696,7 +704,7 @@ mobile/views/components/post-form.vue:
   submit: "投稿"
   reply: "返信"
   renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
   reply-placeholder: "この投稿への返信..."
   cw-placeholder: "内容への注釈 (オプション)"
   location-alert: "お使いの端末は位置情報に対応していません"
@@ -711,11 +719,17 @@ mobile/views/components/timeline.vue:
   empty: "投稿がありません"
   load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
   notifications: "通知"
   messaging: "メッセージ"
+  follow-requests: "フォロー申請"
   search: "検索"
   drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
   settings: "設定"
   about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
@@ -726,8 +740,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:
@@ -740,6 +760,10 @@ mobile/views/pages/messaging.vue:
   messaging: "メッセージ"
 mobile/views/pages/messaging-room.vue:
   messaging: "メッセージ"
+mobile/views/pages/received-follow-requests.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 mobile/views/pages/note.vue:
   title: "投稿"
   prev: "前の投稿"

locales/pl.yml

@@ -3,8 +3,8 @@ meta:
   lang: "język polski"
   divider: ""
 common:
-  misskey: "A planet of fediverse"
+  misskey: "Planeta Fediwersum"
-  about-title: "A ⭐ of fediverse."
+  about-title: "⭐ Fediwersum"
   about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
   time:
     unknown: "nieznany"
@@ -36,18 +36,19 @@ common:
     confused: "Zmieszany"
     pudding: "Pudding"
   note-placeholders:
-    a: "今どうしてる？"
+    a: "Co robisz?"
-    b: "何かありましたか？"
+    b: "Co się wydarzyło?"
-    c: "何をお考えですか？"
+    c: "Co Ci chodzi po głowie?"
-    d: "言いたいことは？"
+    d: "Czy masz coś do powiedzenia?"
-    e: "ここに書いてください"
+    e: "Napisz coś tutaj!"
-    f: "あなたが書くのを待っています..."
+    f: "Czekamy, aż coś napiszesz."
   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: "Zegar analogowy"
     profile: "Profil"
     calendar: "Kalendarz"
     timemachine: "Kalendarz (wehikuł czasu)"
@@ -289,8 +290,10 @@ desktop/views/components/drive.vue:
     upload: "Wyślij plik"
     url-upload: "Wyślij z adresu URL"
 desktop/views/components/follow-button.vue:
-  unfollow: "Przestań śledzić"
+  unfollow: "フォロー中"
-  follow: "Śledź"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
   followers: "Śledzący"
 desktop/views/components/followers.vue:
@@ -326,9 +329,6 @@ desktop/views/components/note-detail.vue:
   location: "Informacje o lokalizacji"
   renote: "Udostępnienie"
   add-reaction: "Dodaj reakcję"
-desktop/views/components/note-detail.sub.vue:
-  private: "ten wpis jest prywatny"
-  deleted: "ten wpis został usunięty"
 desktop/views/components/notes.note.vue:
   reposted-by: "Udostępniono przez {}"
   reply: "Odpowiedz"
@@ -346,7 +346,7 @@ desktop/views/components/notifications.vue:
 desktop/views/components/post-form.vue:
   reply-placeholder: "Odpowiedz na ten wpis…"
   quote-placeholder: "Zacytuj ten wpis…"
-  submit: "投稿"
+  submit: "Wyślij"
   reply: "Odpowiedz"
   renote: "Udostępnienie"
   posted: "Opublikowano!"
@@ -429,7 +429,7 @@ desktop/views/components/settings.vue:
   cache-warn: "Pamięć podręczna informacji o koncie/wpisów/odpowiedzi/wiadomości/ustawień przechowywanych w przeglądarce zostanie usunięta. Będziesz musiał odświeżyć stronę po wyczyszczeniu."
   cache-cleared: "Wyczyszczono pamięć podręczną"
   cache-cleared-desc: "Proszę odświeżyć stronę."
-  auto-watch: "投稿の自動ウォッチ"
+  auto-watch: "Automatycznie nasłuchuj"
   auto-watch-desc: "Otrzymuj natychmiastowo informacje o wpisach/odpowiedziach/reakcjach."
   about: "O Misskey"
   operator: "Administrator instancji"
@@ -472,13 +472,13 @@ desktop/views/components/settings.2fa.vue:
   failed: "Nie udało się skonfigurować uwierzytelniania dwuetapowego, upewnij się że wprowadziłeś prawidłowy token."
   info: "Od teraz, wprowadzaj token wyświetlany na urządzeniu przy każdym logowaniu do Misskey."
 desktop/views/components/settings.api.vue:
-  intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
+  intro: "Aby uzyskać dostęp do API, ustaw ten token jako klucz 'i' parametrów żądań."
   caution: "Nie pokazuj tego tokenu osobom trzecim (nie wprowadzaj go nigdzie indziej), aby konto nie trafiło w niepowołane ręce."
   regeneration-of-token: "W przypadku wycieku tokenu, możesz wygenerować nowy."
   regenerate-token: "Wygeneruj nowy token"
   token: "Token:"
   enter-password: "Wprowadź hasło"
-desktop/views/components/settings.app.vue:
+desktop/views/components/settings.apps.vue:
   no-apps: "Brak zautoryzowanych aplikacji"
 desktop/views/components/settings.mute.vue:
   no-users: "Brak wyciszonych użytkowników"
@@ -516,6 +516,7 @@ desktop/views/components/ui.header.account.vue:
   drive: "Dysk"
   favorites: "Ulubione"
   lists: "Listy"
+  follow-requests: "フォロー申請"
   customize: "Dostosuj"
   settings: "Ustawienia"
   signout: "Wyloguj się"
@@ -530,7 +531,12 @@ desktop/views/components/ui.header.post.vue:
   post: "Utwórz nowy wpis"
 desktop/views/components/ui.header.search.vue:
   placeholder: "Szukaj"
+desktop/views/components/received-follow-requests-window.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 desktop/views/components/user-lists-window.vue:
+  title: "リスト"
   create-list: "Utwórz listę"
 desktop/views/components/user-preview.vue:
   notes: "Wpisy"
@@ -547,8 +553,8 @@ desktop/views/components/window.vue:
   popout: "Pop-out"
   close: "Zamknij"
 desktop/views/pages/welcome.vue:
-  about: "詳しく..."
+  about: "O Misskey"
-  gotit: "わかった"
+  gotit: "Rozumiem!"
   signin: "Zaloguj się"
   signup: "Zarejestruj się"
   signin-button: "Zaloguj się"
@@ -655,8 +661,10 @@ mobile/views/components/drive.file-detail.vue:
   hash: "Hash (md5)"
   exif: "EXIF"
 mobile/views/components/follow-button.vue:
+  unfollow: "フォロー中"
   follow: "Śledź"
-  unfollow: "Przestań śledzić"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 mobile/views/components/friends-maker.vue:
   title: "Zacznij śledzić ludzi takich jak Ty"
   empty: "Nie znaleziono podobnych użytkowników."
@@ -696,7 +704,7 @@ mobile/views/components/post-form.vue:
   submit: "Wyślij"
   reply: "Odpowiedz"
   renote: "Udostępnij"
-  renote-placeholder: "Zacytuj wpis… (nieobowiązkowe)"
+  quote-placeholder: "Zacytuj ten wpis… (nieobowiązkowe)"
   reply-placeholder: "Odpowiedź na ten wpis…"
   cw-placeholder: "Treść ostrzeżenia (opcjonalnie)"
   location-alert: "Twoje urządzenie nie pozwala na przekazywanie informacji o lokalizacji"
@@ -711,11 +719,17 @@ mobile/views/components/timeline.vue:
   empty: "Brak wpisów"
   load-more: "Więcej"
 mobile/views/components/ui.nav.vue:
-  home: "Strona główna"
+  timeline: "Oś czasu"
   notifications: "Powiadomienia"
   messaging: "Wiadomości"
+  follow-requests: "フォロー申請"
   search: "Szukaj"
   drive: "Dysk"
+  favorites: "Ulubione"
+  user-lists: "Listy"
+  widgets: "Widżety"
+  game: "Gry"
+  darkmode: "Tryb ciemny"
   settings: "Ustawienia"
   about: "O Misskey"
 mobile/views/components/user-timeline.vue:
@@ -726,8 +740,14 @@ mobile/views/components/users-list.vue:
   all: "Wszyscy"
   known: "Znasz"
   load-more: "Więcej"
+mobile/views/pages/favorites.vue:
+  title: "Ulubione"
+mobile/views/pages/user-lists.vue:
+  title: "Listy"
+  enter-list-name: "Wprowadź nazwę listy"
 mobile/views/pages/drive.vue:
   drive: "Dysk"
+  more: "Załaduj więcej"
 mobile/views/pages/followers.vue:
   followers-of: "Śledzący {}"
 mobile/views/pages/following.vue:
@@ -740,6 +760,10 @@ mobile/views/pages/messaging.vue:
   messaging: "Wiadomości"
 mobile/views/pages/messaging-room.vue:
   messaging: "Wiadomości"
+mobile/views/pages/received-follow-requests.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 mobile/views/pages/note.vue:
   title: "Wpis"
   prev: "Poprzedni wpis"
@@ -783,7 +807,7 @@ mobile/views/pages/settings.vue:
   show-renoted-my-notes: "Pokazuj udostępnienia moich wpisów"
   post-style: "Styl wpisów"
   post-style-standard: "Standardowy"
-  post-style-smart: "スマート"
+  post-style-smart: "Inteligentny"
   behavior: "Zachowanie"
   fetch-on-scroll: "Automatycznie ładuj po przeciągnięciu w dół"
   disable-via-mobile: "Nie oznaczaj wpisów jako „wysłane z telefonu”"

locales/pt.yml

@@ -48,6 +48,7 @@ common:
   update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   widgets:
+    analog-clock: "アナログ時計"
     profile: "プロフィール"
     calendar: "カレンダー"
     timemachine: "カレンダー(タイムマシン)"
@@ -289,8 +290,10 @@ desktop/views/components/drive.vue:
     upload: "ファイルをアップロード"
     url-upload: "URLからアップロード"
 desktop/views/components/follow-button.vue:
-  unfollow: "フォロー解除"
+  unfollow: "フォロー中"
-  follow: "フォローする"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
   followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -326,9 +329,6 @@ 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: "返信"
@@ -478,7 +478,7 @@ desktop/views/components/settings.api.vue:
   regenerate-token: "トークンを再生成"
   token: "Token:"
   enter-password: "パスワードを入力してください"
-desktop/views/components/settings.app.vue:
+desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
 desktop/views/components/settings.mute.vue:
   no-users: "ミュートしているユーザーはいません"
@@ -516,6 +516,7 @@ desktop/views/components/ui.header.account.vue:
   drive: "ドライブ"
   favorites: "お気に入り"
   lists: "リスト"
+  follow-requests: "フォロー申請"
   customize: "カスタマイズ"
   settings: "設定"
   signout: "サインアウト"
@@ -530,7 +531,12 @@ desktop/views/components/ui.header.post.vue:
   post: "新規投稿"
 desktop/views/components/ui.header.search.vue:
   placeholder: "検索"
+desktop/views/components/received-follow-requests-window.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 desktop/views/components/user-lists-window.vue:
+  title: "リスト"
   create-list: "リストを作成"
 desktop/views/components/user-preview.vue:
   notes: "投稿"
@@ -655,8 +661,10 @@ mobile/views/components/drive.file-detail.vue:
   hash: "ハッシュ (md5)"
   exif: "EXIF"
 mobile/views/components/follow-button.vue:
+  unfollow: "フォロー中"
   follow: "フォロー"
-  unfollow: "フォロー解除"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 mobile/views/components/friends-maker.vue:
   title: "気になるユーザーをフォロー"
   empty: "おすすめのユーザーは見つかりませんでした。"
@@ -696,7 +704,7 @@ mobile/views/components/post-form.vue:
   submit: "投稿"
   reply: "返信"
   renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
   reply-placeholder: "この投稿への返信..."
   cw-placeholder: "内容への注釈 (オプション)"
   location-alert: "お使いの端末は位置情報に対応していません"
@@ -711,11 +719,17 @@ mobile/views/components/timeline.vue:
   empty: "投稿がありません"
   load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
   notifications: "通知"
   messaging: "メッセージ"
+  follow-requests: "フォロー申請"
   search: "検索"
   drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
   settings: "設定"
   about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
@@ -726,8 +740,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:
@@ -740,6 +760,10 @@ mobile/views/pages/messaging.vue:
   messaging: "メッセージ"
 mobile/views/pages/messaging-room.vue:
   messaging: "メッセージ"
+mobile/views/pages/received-follow-requests.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 mobile/views/pages/note.vue:
   title: "投稿"
   prev: "前の投稿"

locales/ru.yml

@@ -48,6 +48,7 @@ common:
   update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   widgets:
+    analog-clock: "アナログ時計"
     profile: "プロフィール"
     calendar: "カレンダー"
     timemachine: "カレンダー(タイムマシン)"
@@ -289,8 +290,10 @@ desktop/views/components/drive.vue:
     upload: "ファイルをアップロード"
     url-upload: "URLからアップロード"
 desktop/views/components/follow-button.vue:
-  unfollow: "フォロー解除"
+  unfollow: "フォロー中"
-  follow: "フォローする"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
   followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -326,9 +329,6 @@ 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: "返信"
@@ -478,7 +478,7 @@ desktop/views/components/settings.api.vue:
   regenerate-token: "トークンを再生成"
   token: "Token:"
   enter-password: "パスワードを入力してください"
-desktop/views/components/settings.app.vue:
+desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
 desktop/views/components/settings.mute.vue:
   no-users: "ミュートしているユーザーはいません"
@@ -516,6 +516,7 @@ desktop/views/components/ui.header.account.vue:
   drive: "ドライブ"
   favorites: "お気に入り"
   lists: "リスト"
+  follow-requests: "フォロー申請"
   customize: "カスタマイズ"
   settings: "設定"
   signout: "サインアウト"
@@ -530,7 +531,12 @@ desktop/views/components/ui.header.post.vue:
   post: "新規投稿"
 desktop/views/components/ui.header.search.vue:
   placeholder: "検索"
+desktop/views/components/received-follow-requests-window.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 desktop/views/components/user-lists-window.vue:
+  title: "リスト"
   create-list: "リストを作成"
 desktop/views/components/user-preview.vue:
   notes: "投稿"
@@ -655,8 +661,10 @@ mobile/views/components/drive.file-detail.vue:
   hash: "ハッシュ (md5)"
   exif: "EXIF"
 mobile/views/components/follow-button.vue:
+  unfollow: "フォロー中"
   follow: "フォロー"
-  unfollow: "フォロー解除"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 mobile/views/components/friends-maker.vue:
   title: "気になるユーザーをフォロー"
   empty: "おすすめのユーザーは見つかりませんでした。"
@@ -696,7 +704,7 @@ mobile/views/components/post-form.vue:
   submit: "投稿"
   reply: "返信"
   renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
   reply-placeholder: "この投稿への返信..."
   cw-placeholder: "内容への注釈 (オプション)"
   location-alert: "お使いの端末は位置情報に対応していません"
@@ -711,11 +719,17 @@ mobile/views/components/timeline.vue:
   empty: "投稿がありません"
   load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
   notifications: "通知"
   messaging: "メッセージ"
+  follow-requests: "フォロー申請"
   search: "検索"
   drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
   settings: "設定"
   about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
@@ -726,8 +740,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:
@@ -740,6 +760,10 @@ mobile/views/pages/messaging.vue:
   messaging: "メッセージ"
 mobile/views/pages/messaging-room.vue:
   messaging: "メッセージ"
+mobile/views/pages/received-follow-requests.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 mobile/views/pages/note.vue:
   title: "投稿"
   prev: "前の投稿"

locales/zh.yml

@@ -48,6 +48,7 @@ common:
   update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   widgets:
+    analog-clock: "アナログ時計"
     profile: "プロフィール"
     calendar: "カレンダー"
     timemachine: "カレンダー(タイムマシン)"
@@ -289,8 +290,10 @@ desktop/views/components/drive.vue:
     upload: "ファイルをアップロード"
     url-upload: "URLからアップロード"
 desktop/views/components/follow-button.vue:
-  unfollow: "フォロー解除"
+  unfollow: "フォロー中"
-  follow: "フォローする"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
   followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -326,9 +329,6 @@ 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: "返信"
@@ -478,7 +478,7 @@ desktop/views/components/settings.api.vue:
   regenerate-token: "トークンを再生成"
   token: "Token:"
   enter-password: "パスワードを入力してください"
-desktop/views/components/settings.app.vue:
+desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
 desktop/views/components/settings.mute.vue:
   no-users: "ミュートしているユーザーはいません"
@@ -516,6 +516,7 @@ desktop/views/components/ui.header.account.vue:
   drive: "ドライブ"
   favorites: "お気に入り"
   lists: "リスト"
+  follow-requests: "フォロー申請"
   customize: "カスタマイズ"
   settings: "設定"
   signout: "サインアウト"
@@ -530,7 +531,12 @@ desktop/views/components/ui.header.post.vue:
   post: "新規投稿"
 desktop/views/components/ui.header.search.vue:
   placeholder: "検索"
+desktop/views/components/received-follow-requests-window.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 desktop/views/components/user-lists-window.vue:
+  title: "リスト"
   create-list: "リストを作成"
 desktop/views/components/user-preview.vue:
   notes: "投稿"
@@ -655,8 +661,10 @@ mobile/views/components/drive.file-detail.vue:
   hash: "ハッシュ (md5)"
   exif: "EXIF"
 mobile/views/components/follow-button.vue:
+  unfollow: "フォロー中"
   follow: "フォロー"
-  unfollow: "フォロー解除"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 mobile/views/components/friends-maker.vue:
   title: "気になるユーザーをフォロー"
   empty: "おすすめのユーザーは見つかりませんでした。"
@@ -696,7 +704,7 @@ mobile/views/components/post-form.vue:
   submit: "投稿"
   reply: "返信"
   renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
   reply-placeholder: "この投稿への返信..."
   cw-placeholder: "内容への注釈 (オプション)"
   location-alert: "お使いの端末は位置情報に対応していません"
@@ -711,11 +719,17 @@ mobile/views/components/timeline.vue:
   empty: "投稿がありません"
   load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
   notifications: "通知"
   messaging: "メッセージ"
+  follow-requests: "フォロー申請"
   search: "検索"
   drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
   settings: "設定"
   about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
@@ -726,8 +740,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:
@@ -740,6 +760,10 @@ mobile/views/pages/messaging.vue:
   messaging: "メッセージ"
 mobile/views/pages/messaging-room.vue:
   messaging: "メッセージ"
+mobile/views/pages/received-follow-requests.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 mobile/views/pages/note.vue:
   title: "投稿"
   prev: "前の投稿"

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "2.22.1",
+	"version": "2.25.2",
-	"clientVersion": "1.0.5942",
+	"clientVersion": "1.0.6116",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,

src/client/app/auth/assets/icon.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!-- Generator: Gravit.io --><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="isolation:isolate" viewBox="0 0 512 512" width="512" height="512"><defs><clipPath id="_clipPath_P6eAE2OaBltOJ3gHGVajfqsOnfv4xIns"><rect width="512" height="512"/></clipPath></defs><g clip-path="url(#_clipPath_P6eAE2OaBltOJ3gHGVajfqsOnfv4xIns)"><clipPath id="_clipPath_P6q7MZAUp3XpQhVgs2GuAbegX9v4gkom"><rect x="0" y="0" width="512" height="512" transform="matrix(1,0,0,1,0,0)" fill="rgb(255,255,255)"/></clipPath><g clip-path="url(#_clipPath_P6q7MZAUp3XpQhVgs2GuAbegX9v4gkom)"><g id="Group"><g id="g4502"><g id="g5125"><g id="text4489"><path d=" M 190.093 359.243 C 167.923 359.32 148.881 345.963 139.9 330.409 C 135.104 323.615 125.617 321.198 125.482 330.409 L 125.482 372.939 C 125.482 390.026 119.253 404.799 106.794 417.258 C 94.69 429.362 79.917 435.413 62.474 435.413 C 45.387 435.413 30.614 429.362 18.155 417.258 C 6.052 404.799 0 390.026 0 372.939 L 0 139.061 C 0 125.89 3.738 113.965 11.213 103.285 C 19.045 92.25 29.012 84.596 41.116 80.325 C 47.879 77.833 54.999 76.587 62.474 76.587 C 81.697 76.587 97.716 84.062 110.531 99.013 C 117.295 106.489 121.211 110.405 122.279 110.761 C 122.279 110.761 173.043 172.145 174.467 173.213 C 175.891 174.281 180.073 182.446 190.093 182.446 C 200.112 182.446 204.829 174.281 206.253 173.213 C 207.676 172.145 258.44 110.761 258.44 110.761 C 258.796 111.117 262.534 107.201 269.654 99.013 C 282.825 84.062 299.022 76.587 318.245 76.587 C 325.364 76.587 332.484 77.833 339.603 80.325 C 351.707 84.596 361.496 92.25 368.972 103.285 C 376.803 113.965 380.719 125.89 380.719 139.061 L 380.719 372.939 C 380.719 390.026 374.489 404.799 362.03 417.258 C 349.927 429.362 335.154 435.413 317.711 435.413 C 300.624 435.413 285.851 429.362 273.391 417.258 C 261.288 404.799 255.237 390.026 255.237 372.939 L 255.237 330.409 C 254.184 318.802 243.925 326.116 240.285 330.409 C 230.674 348.208 212.262 359.167 190.093 359.243 Z  M 457.535 184.448 Q 435.109 184.448 419.09 168.963 Q 403.605 152.944 403.605 130.518 Q 403.605 108.091 419.09 92.606 Q 435.109 76.587 457.535 76.587 Q 479.962 76.587 495.981 92.606 Q 512 108.091 512 130.518 Q 512 152.944 495.981 168.963 Q 479.962 184.448 457.535 184.448 Z  M 458.069 195.128 Q 480.496 195.128 495.981 211.147 Q 512 227.166 512 249.592 L 512 381.482 Q 512 403.909 495.981 419.928 Q 480.496 435.413 458.069 435.413 Q 435.643 435.413 419.624 419.928 Q 403.605 403.909 403.605 381.482 L 403.605 249.592 Q 403.605 227.166 419.624 211.147 Q 435.643 195.128 458.069 195.128 Z " fill-rule="evenodd" fill="rgb(157,157,157)"/></g></g></g></g></g></g></svg>

src/client/app/auth/assets/logo.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	 y="0px" width="1024px" height="512px" viewBox="0 256 1024 512" enable-background="new 0 256 1024 512" xml:space="preserve">
-<polyline opacity="0.5" fill="none" stroke="#000000" stroke-width="34" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
-	896.5,608.5 800.5,416.5 704.5,608.5 608.5,416.5 512.5,608.5 416.5,416.5 320.5,608.5 224.5,416.5 128.5,608.5 "/>
-</svg>

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

@@ -3,6 +3,7 @@
 	<main v-if="$store.getters.isSignedIn">
 		<p class="fetching" v-if="fetching">読み込み中<mk-ellipsis/></p>
 		<x-form
+			class="form"
 			ref="form"
 			v-if="state == 'waiting'"
 			:session="session"
@@ -26,7 +27,7 @@
 		<h1>サインインしてください</h1>
 		<mk-signin/>
 	</main>
-	<footer><img src="/assets/auth/logo.svg" alt="Misskey"/></footer>
+	<footer><img src="/assets/auth/icon.svg" alt="Misskey"/></footer>
 </div>
 </template>
 
@@ -62,7 +63,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();
@@ -102,7 +103,7 @@ export default Vue.extend({
 			padding 32px
 			color #555
 
-		> div
+		> div:not(.form)
 			padding 64px
 
 			> h1
@@ -143,8 +144,8 @@ export default Vue.extend({
 	> footer
 		> img
 			display block
-			width 64px
+			width 32px
-			height 64px
+			height 32px
-			margin 0 auto
+			margin 16px auto
 
 </style>

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 == '/docs' || url.pathname.startsWith('/docs/')) app = 'docs';
-	if (url.pathname == '/dev') app = 'dev';
+	if (url.pathname == '/dev' || url.pathname.startsWith('/dev/')) app = 'dev';
-	if (url.pathname == '/auth') app = 'auth';
+	if (url.pathname == '/auth' || url.pathname.startsWith('/auth/')) app = 'auth';
 	//#endregion
 
 	//#region Detect the user language

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

@@ -20,7 +20,7 @@ export class HomeStream extends Stream {
 		}, 1000 * 60);
 
 		// 自分の情報が更新されたとき
-		this.on('i_updated', i => {
+		this.on('meUpdated', i => {
 			if (os.debug) {
 				console.log('I updated:', i);
 			}

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/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">
+<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,18 +20,31 @@ 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
+	width 100%
+
+	&: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
-	height 256px
-
-	@media (max-width 500px)
-		height 192px
 
 		&[data-count="1"]
 			grid-template-rows 1fr
@@ -43,7 +58,7 @@ export default Vue.extend({
 				grid-row 1 / 3
 			:nth-child(3)
 				grid-column 2 / 3
-			grid-row 2/3
+				grid-row 2 / 3
 		&[data-count="4"]
 			grid-template-columns 1fr 1fr
 			grid-template-rows 1fr 1fr

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/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/follow-button.vue

@@ -1,19 +1,16 @@
 <template>
 <button class="mk-follow-button"
-	:class="{ wait, follow: !user.isFollowing, unfollow: user.isFollowing, big: size == 'big' }"
+	:class="{ wait, active: u.isFollowing || u.hasPendingFollowRequestFromYou, big: size == 'big' }"
 	@click="onClick"
 	:disabled="wait"
-	:title="user.isFollowing ? '%i18n:@unfollow%' : '%i18n:@follow%'"
 >
-	<template v-if="!wait && user.isFollowing">
+	<template v-if="!wait">
-		<template v-if="size == 'compact'">%fa:minus%</template>
+		<template v-if="u.hasPendingFollowRequestFromYou">%fa:hourglass-half%<template v-if="size == 'big'"> %i18n:@request-pending%</template></template>
-		<template v-if="size == 'big'">%fa:minus%%i18n:@unfollow%</template>
+		<template v-else-if="u.isFollowing">%fa:minus%<template v-if="size == 'big'"> %i18n:@following%</template></template>
+		<template v-else-if="!u.isFollowing && u.isLocked">%fa:plus%<template v-if="size == 'big'"> %i18n:@follow-request%</template></template>
+		<template v-else-if="!u.isFollowing && !u.isLocked">%fa:plus%<template v-if="size == 'big'"> %i18n:@follow%</template></template>
 	</template>
-	<template v-if="!wait && !user.isFollowing">
+	<template v-else>%fa:spinner .pulse .fw%</template>
-		<template v-if="size == 'compact'">%fa:plus%</template>
-		<template v-if="size == 'big'">%fa:plus%%i18n:@follow%</template>
-	</template>
-	<template v-if="wait">%fa:spinner .pulse .fw%</template>
 </button>
 </template>
 
@@ -34,6 +31,7 @@ export default Vue.extend({
 
 	data() {
 		return {
+			u: this.user,
 			wait: false,
 			connection: null,
 			connectionId: null
@@ -56,39 +54,44 @@ export default Vue.extend({
 
 	methods: {
 		onFollow(user) {
-			if (user.id == this.user.id) {
+			if (user.id == this.u.id) {
 				this.user.isFollowing = user.isFollowing;
 			}
 		},
 
 		onUnfollow(user) {
-			if (user.id == this.user.id) {
+			if (user.id == this.u.id) {
 				this.user.isFollowing = user.isFollowing;
 			}
 		},
 
-		onClick() {
+		async onClick() {
 			this.wait = true;
-			if (this.user.isFollowing) {
+
-				(this as any).api('following/delete', {
+			try {
-					userId: this.user.id
+				if (this.u.isFollowing) {
-				}).then(() => {
+					this.u = await (this as any).api('following/delete', {
-					this.user.isFollowing = false;
+						userId: this.u.id
-				}).catch(err => {
-					console.error(err);
-				}).then(() => {
-					this.wait = false;
 					});
 				} else {
-				(this as any).api('following/create', {
+					if (this.u.isLocked && this.u.hasPendingFollowRequestFromYou) {
-					userId: this.user.id
+						this.u = await (this as any).api('following/requests/cancel', {
-				}).then(() => {
+							userId: this.u.id
-					this.user.isFollowing = true;
-				}).catch(err => {
-					console.error(err);
-				}).then(() => {
-					this.wait = false;
 						});
+					} else if (this.u.isLocked) {
+						this.u = await (this as any).api('following/create', {
+							userId: this.u.id
+						});
+					} else {
+						this.u = await (this as any).api('following/create', {
+							userId: this.user.id
+						});
+					}
+				}
+			} catch (e) {
+				console.error(e);
+			} finally {
+				this.wait = false;
 			}
 		}
 	}
@@ -124,7 +127,7 @@ root(isDark)
 			border 2px solid rgba($theme-color, 0.3)
 			border-radius 8px
 
-	&.follow
+	&:not(.active)
 		color isDark ? #fff : #888
 		background isDark ? linear-gradient(to bottom, #313543 0%, #282c37 100%) : linear-gradient(to bottom, #ffffff 0%, #f5f5f5 100%)
 		border solid 1px isDark ? #1c2023 : #e2e2e2
@@ -137,7 +140,7 @@ root(isDark)
 			background isDark ? #22262f : #ececec
 			border-color isDark ? #151a1d : #dcdcdc
 
-	&.unfollow
+	&.active
 		color $theme-color-foreground
 		background linear-gradient(to bottom, lighten($theme-color, 25%) 0%, lighten($theme-color, 10%) 100%)
 		border solid 1px lighten($theme-color, 15%)
@@ -162,9 +165,6 @@ root(isDark)
 		height 38px
 		line-height 38px
 
-		i
-			margin-right 8px
-
 .mk-follow-button[data-darkmode]
 	root(true)
 

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>
@@ -62,9 +63,8 @@
 				<component v-for="widget in widgets[place]" :is="`mkw-${widget.name}`" :key="widget.id" :ref="widget.id" :widget="widget" @chosen="warp"/>
 			</div>
 			<div class="main">
-				<mk-post-form v-if="$store.state.settings.showPostFormOnTopOfTl"/>
+				<mk-post-form class="form" v-if="$store.state.settings.showPostFormOnTopOfTl"/>
-				<mk-timeline ref="tl" @loaded="onTlLoaded" v-if="mode == 'timeline'"/>
+				<mk-timeline class="tl" cref="tl" @loaded="onTlLoaded" v-if="mode == 'timeline'"/>
-				<mk-mentions @loaded="onTlLoaded" v-if="mode == 'mentions'"/>
 			</div>
 		</template>
 	</div>
@@ -298,11 +298,18 @@ root(isDark)
 			width calc(100% - 275px * 2)
 			order 2
 
-			.mk-post-form
+			> .form
 				margin-bottom 16px
 				border solid 1px rgba(#000, 0.075)
 				border-radius 4px
 
+			@media (max-width 700px)
+				padding 0
+
+				> .tl
+					border none
+					border-radius 0
+
 		> *:not(.main)
 			width 275px
 			padding 16px 0 16px 0

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">
+			<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
+		flex 1
-		width calc(100% - 60px)
+		min-width 0
 
 		> header
 			display flex
@@ -75,10 +80,19 @@ root(isDark)
 				text-overflow ellipsis
 				color isDark ? #606984 : #d1d8da
 
-			> .time
+			> .info
 				margin-left auto
+				font-size 0.9em
+
+				> *
 					color isDark ? #606984 : #b2b8bb
 
+				> .mobile
+					margin-right 6px
+
+				> .visibility
+					margin-left 6px
+
 		> .body
 
 			> .text

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
+		flex 1
-		width calc(100% - 60px)
+		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
+			flex 1
-			width calc(100% - 74px)
+			min-width 0
 
 			> header
 				display flex
@@ -467,7 +463,7 @@ root(isDark)
 					> .app
 						margin-right 8px
 						padding-right 8px
-						border-right solid 1px #eaeaea
+						border-right solid 1px isDark ? #1c2023 : #eaeaea
 
 					> .visibility
 						margin-left 8px
@@ -556,7 +552,7 @@ root(isDark)
 							padding 2px 8px 2px 16px
 							font-size 90%
 							color #8d969e
-							background #edf0f3
+							background isDark ? #313543 : #edf0f3
 							border-radius 4px
 
 							&:before
@@ -569,7 +565,7 @@ root(isDark)
 								width 8px
 								height 8px
 								margin auto 0
-								background #fff
+								background isDark ? #282c37 : #fff
 								border-radius 100%
 
 							&:hover

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

@@ -5,6 +5,7 @@
 			<template v-for="(notification, i) in _notifications">
 				<div class="notification" :class="notification.type" :key="notification.id">
 					<mk-time :time="notification.createdAt"/>
+
 					<template v-if="notification.type == 'reaction'">
 						<mk-avatar class="avatar" :user="notification.user"/>
 						<div class="text">
@@ -17,6 +18,7 @@
 							</router-link>
 						</div>
 					</template>
+
 					<template v-if="notification.type == 'renote'">
 						<mk-avatar class="avatar" :user="notification.note.user"/>
 						<div class="text">
@@ -28,6 +30,7 @@
 							</router-link>
 						</div>
 					</template>
+
 					<template v-if="notification.type == 'quote'">
 						<mk-avatar class="avatar" :user="notification.note.user"/>
 						<div class="text">
@@ -37,6 +40,7 @@
 							<router-link class="note-preview" :to="notification.note | notePage">{{ getNoteSummary(notification.note) }}</router-link>
 						</div>
 					</template>
+
 					<template v-if="notification.type == 'follow'">
 						<mk-avatar class="avatar" :user="notification.user"/>
 						<div class="text">
@@ -45,6 +49,16 @@
 							</p>
 						</div>
 					</template>
+
+					<template v-if="notification.type == 'receiveFollowRequest'">
+						<mk-avatar class="avatar" :user="notification.user"/>
+						<div class="text">
+							<p>%fa:user-clock%
+								<router-link :to="notification.user | userPage" v-user-preview="notification.user.id">{{ notification.user | userName }}</router-link>
+							</p>
+						</div>
+					</template>
+
 					<template v-if="notification.type == 'reply'">
 						<mk-avatar class="avatar" :user="notification.note.user"/>
 						<div class="text">
@@ -54,6 +68,7 @@
 							<router-link class="note-preview" :to="notification.note | notePage">{{ getNoteSummary(notification.note) }}</router-link>
 						</div>
 					</template>
+
 					<template v-if="notification.type == 'mention'">
 						<mk-avatar class="avatar" :user="notification.note.user"/>
 						<div class="text">
@@ -63,6 +78,7 @@
 							<a class="note-preview" :href="notification.note | notePage">{{ getNoteSummary(notification.note) }}</a>
 						</div>
 					</template>
+
 					<template v-if="notification.type == 'poll_vote'">
 						<mk-avatar class="avatar" :user="notification.user"/>
 						<div class="text">
@@ -73,6 +89,7 @@
 						</div>
 					</template>
 				</div>
+
 				<p class="date" v-if="i != notifications.length - 1 && notification._date != _notifications[i + 1]._date" :key="notification.id + '-time'">
 					<span>%fa:angle-up%{{ notification._datetext }}</span>
 					<span>%fa:angle-down%{{ _notifications[i + 1]._datetext }}</span>
@@ -251,6 +268,10 @@ root(isDark)
 					.text p i
 						color #53c7ce
 
+				&.receiveFollowRequest
+					.text p i
+						color #888
+
 				&.reply, &.mention
 					.text p i
 						color #555

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

@@ -1,14 +1,15 @@
 <template>
-<mk-window ref="window" is-modal @closed="$destroy">
+<mk-window class="mk-post-form-window" ref="window" is-modal @closed="$destroy">
-	<span slot="header">
+	<span slot="header" class="mk-post-form-window--header">
-		<span :class="$style.icon" v-if="geo">%fa:map-marker-alt%</span>
+		<span class="icon" v-if="geo">%fa:map-marker-alt%</span>
 		<span v-if="!reply">%i18n:@note%</span>
 		<span v-if="reply">%i18n:@reply%</span>
-		<span :class="$style.count" v-if="media.length != 0">{{ '%i18n:@attaches%'.replace('{}', media.length) }}</span>
+		<span class="count" v-if="media.length != 0">{{ '%i18n:@attaches%'.replace('{}', media.length) }}</span>
-		<span :class="$style.count" v-if="uploadings.length != 0">{{ '%i18n:@uploading-media%'.replace('{}', uploadings.length) }}<mk-ellipsis/></span>
+		<span class="count" v-if="uploadings.length != 0">{{ '%i18n:@uploading-media%'.replace('{}', uploadings.length) }}<mk-ellipsis/></span>
 	</span>
 
-	<mk-note-preview v-if="reply" :class="$style.notePreview" :note="reply"/>
+	<div class="mk-post-form-window--body">
+		<mk-note-preview v-if="reply" class="notePreview" :note="reply"/>
 		<mk-post-form ref="form"
 			:reply="reply"
 			@posted="onPosted"
@@ -16,6 +17,7 @@
 			@change-attached-media="onChangeMedia"
 			@geo-attached="onGeoAttached"
 			@geo-dettached="onGeoDettached"/>
+	</div>
 </mk-window>
 </template>
 
@@ -56,11 +58,13 @@ export default Vue.extend({
 });
 </script>
 
-<style lang="stylus" module>
+<style lang="stylus" scoped>
-.icon
+root(isDark)
+	.mk-post-form-window--header
+		.icon
 			margin-right 8px
 
-.count
+		.count
 			margin-left 8px
 			opacity 0.8
 
@@ -70,7 +74,17 @@ export default Vue.extend({
 			&:after
 				content ')'
 
-.notePreview
+	.mk-post-form-window--body
+		.notePreview
+			if isDark
 				margin 16px 22px 0 22px
+			else
+				margin 16px 22px
+
+.mk-post-form-window[data-darkmode]
+	root(true)
+
+.mk-post-form-window:not([data-darkmode])
+	root(false)
 
 </style>

src/client/app/desktop/views/components/received-follow-requests-window.vue

@@ -0,0 +1,72 @@
+<template>
+<mk-window ref="window" is-modal width="450px" height="500px" @closed="$destroy">
+	<span slot="header">%fa:envelope R% %i18n:@title%</span>
+
+	<div data-id="c1136cec-1278-49b1-9ea7-412c1ef794f4" :data-darkmode="$store.state.device.darkmode">
+		<div v-for="req in requests">
+			<router-link :key="req.id" :to="req.follower | userPage">{{ req.follower | userName }}</router-link>
+			<span>
+				<a @click="accept(req.follower)">%i18n:@accept%</a>|<a @click="reject(req.follower)">%i18n:@reject%</a>
+			</span>
+		</div>
+	</div>
+</mk-window>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+export default Vue.extend({
+	data() {
+		return {
+			fetching: true,
+			requests: []
+		};
+	},
+	mounted() {
+		(this as any).api('following/requests/list').then(requests => {
+			this.fetching = false;
+			this.requests = requests;
+		});
+	},
+	methods: {
+		accept(user) {
+			(this as any).api('following/requests/accept', { userId: user.id }).then(() => {
+				this.requests = this.requests.filter(r => r.follower.id != user.id);
+			});
+		},
+		reject(user) {
+			(this as any).api('following/requests/reject', { userId: user.id }).then(() => {
+				this.requests = this.requests.filter(r => r.follower.id != user.id);
+			});
+		},
+		close() {
+			(this as any).$refs.window.close();
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+
+root(isDark)
+	padding 16px
+
+	> button
+		margin-bottom 16px
+
+	> div
+		display flex
+		padding 16px
+		border solid 1px isDark ? #1c2023 : #eee
+		border-radius 4px
+
+		> span
+			margin 0 0 0 auto
+
+[data-id="c1136cec-1278-49b1-9ea7-412c1ef794f4"][data-darkmode]
+	root(true)
+
+[data-id="c1136cec-1278-49b1-9ea7-412c1ef794f4"]:not([data-darkmode])
+	root(false)
+
+</style>

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

@@ -23,7 +23,11 @@
 	</label>
 	<button class="ui primary" @click="save">%i18n:@save%</button>
 	<section>
-		<h2>その他</h2>
+		<h2>%i18n:@locked-account%</h2>
+		<mk-switch v-model="$store.state.i.isLocked" @change="onChangeIsLocked" text="%i18n:@is-locked%"/>
+	</section>
+	<section>
+		<h2>%i18n:@other%</h2>
 		<mk-switch v-model="$store.state.i.isBot" @change="onChangeIsBot" text="%i18n:@is-bot%"/>
 		<mk-switch v-model="$store.state.i.isCat" @change="onChangeIsCat" text="%i18n:@is-cat%"/>
 	</section>
@@ -62,6 +66,11 @@ export default Vue.extend({
 				(this as any).apis.notify('プロフィールを更新しました');
 			});
 		},
+		onChangeIsLocked() {
+			(this as any).api('i/update', {
+				isLocked: this.$store.state.i.isLocked
+			});
+		},
 		onChangeIsBot() {
 			(this as any).api('i/update', {
 				isBot: this.$store.state.i.isBot

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)
+	color rgba(isDark ? #fff : #000, 0.6)
-	background rgba(#fff, 0.9)
+	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.account.vue

@@ -19,6 +19,9 @@
 				<li @click="list">
 					<p>%fa:list%<span>%i18n:@lists%</span>%fa:angle-right%</p>
 				</li>
+				<li @click="followRequests" v-if="$store.state.i.isLocked">
+					<p>%fa:envelope R%<span>%i18n:@follow-requests%<i v-if="$store.state.i.pendingReceivedFollowRequestsCount">{{ $store.state.i.pendingReceivedFollowRequestsCount }}</i></span>%fa:angle-right%</p>
+				</li>
 			</ul>
 			<ul>
 				<li>
@@ -46,6 +49,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import MkUserListsWindow from './user-lists-window.vue';
+import MkFollowRequestsWindow from './received-follow-requests-window.vue';
 import MkSettingsWindow from './settings-window.vue';
 import MkDriveWindow from './drive-window.vue';
 import contains from '../../../common/scripts/contains';
@@ -91,6 +95,10 @@ export default Vue.extend({
 				this.$router.push(`i/lists/${ list.id }`);
 			});
 		},
+		followRequests() {
+			this.close();
+			(this as any).os.new(MkFollowRequestsWindow);
+		},
 		settings() {
 			this.close();
 			(this as any).os.new(MkSettingsWindow);
@@ -225,6 +233,16 @@ root(isDark)
 					> span:first-child
 						padding-left 22px
 
+					> span:nth-child(2)
+						> i
+							margin-left 4px
+							padding 2px 8px
+							font-size 90%
+							font-style normal
+							background $theme-color
+							color $theme-color-foreground
+							border-radius 8px
+
 					> [data-fa]:first-child
 						margin-right 6px
 						width 16px

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.vue

@@ -1,6 +1,6 @@
 <template>
-<div>
+<div class="mk-ui">
-	<x-header/>
+	<x-header class="header"/>
 	<div class="content">
 		<slot></slot>
 	</div>
@@ -35,3 +35,9 @@ export default Vue.extend({
 });
 </script>
 
+<style lang="stylus" scoped>
+.mk-ui
+	> .header
+		@media (max-width 1000px)
+			display none
+</style>

src/client/app/desktop/views/components/user-lists-window.vue

@@ -1,6 +1,6 @@
 <template>
 <mk-window ref="window" is-modal width="450px" height="500px" @closed="$destroy">
-	<span slot="header">%fa:list% リスト</span>
+	<span slot="header">%fa:list% %i18n:@title%</span>
 
 	<div data-id="6e4caea3-d8f9-4ab7-96de-ab67fe8d5c82" :data-darkmode="$store.state.device.darkmode">
 		<button class="ui" @click="add">%i18n:@create-list%</button>

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

@@ -80,6 +80,8 @@ 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
@@ -103,6 +105,7 @@ root(isDark)
 		text-align center
 
 		&.about
+			font-family 'Noto Sans JP'
 			color isDark ? #fff : #627574
 
 			> article
@@ -114,7 +117,7 @@ root(isDark)
 
 				> h1
 					margin 0
-					font-variant small-caps
+					font-weight 900
 
 				> p
 					margin 20px 0

src/client/app/mobile/script.ts

@@ -32,10 +32,14 @@ import MkNotifications from './views/pages/notifications.vue';
 import MkWidgets from './views/pages/widgets.vue';
 import MkMessaging from './views/pages/messaging.vue';
 import MkMessagingRoom from './views/pages/messaging-room.vue';
+import MkReceivedFollowRequests from './views/pages/received-follow-requests.vue';
 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 +76,10 @@ 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/received-follow-requests', name: 'received-follow-requests', component: MkReceivedFollowRequests },
 			{ 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/follow-button.vue

@@ -1,13 +1,16 @@
 <template>
 <button class="mk-follow-button"
-	:class="{ wait: wait, follow: !user.isFollowing, unfollow: user.isFollowing }"
+	:class="{ wait: wait, active: u.isFollowing || u.hasPendingFollowRequestFromYou }"
 	@click="onClick"
 	:disabled="wait"
 >
-	<template v-if="!wait && user.isFollowing">%fa:minus%</template>
+	<template v-if="!wait">
-	<template v-if="!wait && !user.isFollowing">%fa:plus%</template>
+		<template v-if="u.hasPendingFollowRequestFromYou">%fa:hourglass-half% %i18n:@request-pending%</template>
-	<template v-if="wait">%fa:spinner .pulse .fw%</template>
+		<template v-else-if="u.isFollowing">%fa:minus% %i18n:@following%</template>
-	{{ user.isFollowing ? '%i18n:@unfollow%' : '%i18n:@follow%' }}
+		<template v-else-if="!u.isFollowing && u.isLocked">%fa:plus% %i18n:@follow-request%</template>
+		<template v-else-if="!u.isFollowing && !u.isLocked">%fa:plus% %i18n:@follow%</template>
+	</template>
+	<template v-else>%fa:spinner .pulse .fw%</template>
 </button>
 </template>
 
@@ -22,6 +25,7 @@ export default Vue.extend({
 	},
 	data() {
 		return {
+			u: this.user,
 			wait: false,
 			connection: null,
 			connectionId: null
@@ -42,39 +46,44 @@ export default Vue.extend({
 	methods: {
 
 		onFollow(user) {
-			if (user.id == this.user.id) {
+			if (user.id == this.u.id) {
-				this.user.isFollowing = user.isFollowing;
+				this.u.isFollowing = user.isFollowing;
 			}
 		},
 
 		onUnfollow(user) {
-			if (user.id == this.user.id) {
+			if (user.id == this.u.id) {
-				this.user.isFollowing = user.isFollowing;
+				this.u.isFollowing = user.isFollowing;
 			}
 		},
 
-		onClick() {
+		async onClick() {
 			this.wait = true;
-			if (this.user.isFollowing) {
+
-				(this as any).api('following/delete', {
+			try {
-					userId: this.user.id
+				if (this.u.isFollowing) {
-				}).then(() => {
+					this.u = await (this as any).api('following/delete', {
-					this.user.isFollowing = false;
+						userId: this.u.id
-				}).catch(err => {
-					console.error(err);
-				}).then(() => {
-					this.wait = false;
 					});
 				} else {
-				(this as any).api('following/create', {
+					if (this.u.isLocked && this.u.hasPendingFollowRequestFromYou) {
-					userId: this.user.id
+						this.u = await (this as any).api('following/requests/cancel', {
-				}).then(() => {
+							userId: this.u.id
-					this.user.isFollowing = true;
-				}).catch(err => {
-					console.error(err);
-				}).then(() => {
-					this.wait = false;
 						});
+					} else if (this.u.isLocked) {
+						this.u = await (this as any).api('following/create', {
+							userId: this.u.id
+						});
+					} else {
+						this.u = await (this as any).api('following/create', {
+							userId: this.user.id
+						});
+					}
+				}
+			} catch (e) {
+				console.error(e);
+			} finally {
+				this.wait = false;
 			}
 		}
 	}
@@ -90,18 +99,15 @@ export default Vue.extend({
 	cursor pointer
 	padding 0 16px
 	margin 0
-	height inherit
+	min-width 150px
-	font-size 16px
+	line-height 36px
-	outline none
+	font-size 14px
-	border solid 1px $theme-color
+	font-weight bold
-	border-radius 4px
-
-	*
-		pointer-events none
-
-	&.follow
 	color $theme-color
 	background transparent
+	outline none
+	border solid 1px $theme-color
+	border-radius 36px
 
 	&:hover
 		background rgba($theme-color, 0.1)
@@ -109,15 +115,23 @@ export default Vue.extend({
 	&:active
 		background rgba($theme-color, 0.2)
 
-	&.unfollow
+	&.active
 		color $theme-color-foreground
 		background $theme-color
 
+		&:hover
+			background lighten($theme-color, 10%)
+			border-color lighten($theme-color, 10%)
+
+		&:active
+			background darken($theme-color, 10%)
+			border-color darken($theme-color, 10%)
+
 	&.wait
 		cursor wait !important
 		opacity 0.7
 
-	> [data-fa]
+	*
-		margin-right 4px
+		pointer-events none
 
 </style>

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">
+			<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
+	@media (min-width 350px)
-		content ""
+		font-size 12px
-		display block
+
-		clear both
+	@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 10px 0 0
-		margin 0 12px 0 0
+		width 40px
-		width 48px
+		height 40px
-		height 48px
 		border-radius 8px
 
-		@media (max-width 500px)
+		@media (min-width 350px)
 			margin 0 10px 0 0
 			width 44px
 			height 44px
 
-	> .main
+		@media (min-width 500px)
-		float left
+			margin 0 12px 0 0
-		width calc(100% - 60px)
+			width 48px
+			height 48px
 
-		@media (max-width 500px)
+	> .main
-			width calc(100% - 54px)
+		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,10 +125,19 @@ root(isDark)
 				text-overflow ellipsis
 				color isDark ? #606984 : #d1d8da
 
-			> .time
+			> .info
 				margin-left auto
+				font-size 0.9em
+
+				> *
 					color isDark ? #606984 : #b2b8bb
 
+				> .mobile
+					margin-right 6px
+
+				> .visibility
+					margin-left 6px
+
 		> .body
 
 			> .text

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,18 +70,18 @@ root(isDark)
 			> header
 				align-items center
 
-	&:after
-		content ""
-		display block
-		clear both
-
 	> .avatar
+		flex-shrink 0
 		display block
-		float left
+		margin 0 8px 0 0
-		margin 0 10px 0 0
+		width 38px
+		height 38px
+		border-radius 8px
+
+		@media (min-width 350px)
+			margin-right 10px
 			width 42px
 			height 42px
-		border-radius 8px
 
 		@media (min-width 500px)
 			margin-right 14px
@@ -72,11 +89,8 @@ root(isDark)
 			height 50px
 
 	> .main
-		float left
+		flex 1
-		width calc(100% - 52px)
+		min-width 0
-
-		@media (min-width 500px)
-			width calc(100% - 64px)
 
 		> 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
+			width 42px
-			height 48px
+			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
+			flex 1
-			width calc(100% - 58px)
+			min-width 0
-
-			@media (min-width 500px)
-				width calc(100% - 74px)
 
 			> 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
@@ -504,7 +502,7 @@ root(isDark)
 							padding 2px 8px 2px 16px
 							font-size 90%
 							color #8d969e
-							background #edf0f3
+							background isDark ? #313543 : #edf0f3
 							border-radius 4px
 
 							&:before
@@ -517,7 +515,7 @@ root(isDark)
 								width 8px
 								height 8px
 								margin auto 0
-								background #fff
+								background isDark ? #282c37 : #fff
 								border-radius 100%
 
 					> .media

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

@@ -1,7 +1,7 @@
 <template>
 <div class="mk-notification-preview" :class="notification.type">
 	<template v-if="notification.type == 'reaction'">
-		<img class="avatar" :src="`${notification.user.avatarUrl}?thumbnail&size=64`" alt="avatar"/>
+		<mk-avatar class="avatar" :user="notification.user"/>
 		<div class="text">
 			<p><mk-reaction-icon :reaction="notification.reaction"/>{{ notification.user | userName }}</p>
 			<p class="note-ref">%fa:quote-left%{{ getNoteSummary(notification.note) }}%fa:quote-right%</p>
@@ -9,7 +9,7 @@
 	</template>
 
 	<template v-if="notification.type == 'renote'">
-		<img class="avatar" :src="`${notification.note.user.avatarUrl}?thumbnail&size=64`" alt="avatar"/>
+		<mk-avatar class="avatar" :user="notification.note.user"/>
 		<div class="text">
 			<p>%fa:retweet%{{ notification.note.user | userName }}</p>
 			<p class="note-ref">%fa:quote-left%{{ getNoteSummary(notification.note.renote) }}%fa:quote-right%</p>
@@ -17,7 +17,7 @@
 	</template>
 
 	<template v-if="notification.type == 'quote'">
-		<img class="avatar" :src="`${notification.note.user.avatarUrl}?thumbnail&size=64`" alt="avatar"/>
+		<mk-avatar class="avatar" :user="notification.note.user"/>
 		<div class="text">
 			<p>%fa:quote-left%{{ notification.note.user | userName }}</p>
 			<p class="note-preview">{{ getNoteSummary(notification.note) }}</p>
@@ -25,14 +25,21 @@
 	</template>
 
 	<template v-if="notification.type == 'follow'">
-		<img class="avatar" :src="`${notification.user.avatarUrl}?thumbnail&size=64`" alt="avatar"/>
+		<mk-avatar class="avatar" :user="notification.user"/>
 		<div class="text">
 			<p>%fa:user-plus%{{ notification.user | userName }}</p>
 		</div>
 	</template>
 
+	<template v-if="notification.type == 'receiveFollowRequest'">
+		<mk-avatar class="avatar" :user="notification.user"/>
+		<div class="text">
+			<p>%fa:user-clock%{{ notification.user | userName }}</p>
+		</div>
+	</template>
+
 	<template v-if="notification.type == 'reply'">
-		<img class="avatar" :src="`${notification.note.user.avatarUrl}?thumbnail&size=64`" alt="avatar"/>
+		<mk-avatar class="avatar" :user="notification.note.user"/>
 		<div class="text">
 			<p>%fa:reply%{{ notification.note.user | userName }}</p>
 			<p class="note-preview">{{ getNoteSummary(notification.note) }}</p>
@@ -40,7 +47,7 @@
 	</template>
 
 	<template v-if="notification.type == 'mention'">
-		<img class="avatar" :src="`${notification.note.user.avatarUrl}?thumbnail&size=64`" alt="avatar"/>
+		<mk-avatar class="avatar" :user="notification.note.user"/>
 		<div class="text">
 			<p>%fa:at%{{ notification.note.user | userName }}</p>
 			<p class="note-preview">{{ getNoteSummary(notification.note) }}</p>
@@ -48,7 +55,7 @@
 	</template>
 
 	<template v-if="notification.type == 'poll_vote'">
-		<img class="avatar" :src="`${notification.user.avatarUrl}?thumbnail&size=64`" alt="avatar"/>
+		<mk-avatar class="avatar" :user="notification.user"/>
 		<div class="text">
 			<p>%fa:chart-pie%{{ notification.user | userName }}</p>
 			<p class="note-ref">%fa:quote-left%{{ getNoteSummary(notification.note) }}%fa:quote-right%</p>
@@ -83,16 +90,14 @@ export default Vue.extend({
 		display block
 		clear both
 
-	img
+	> .avatar
 		display block
 		float left
-		min-width 36px
+		width 36px
-		min-height 36px
+		height 36px
-		max-width 36px
-		max-height 36px
 		border-radius 6px
 
-	.text
+	> .text
 		float right
 		width calc(100% - 36px)
 		padding-left 8px
@@ -120,6 +125,10 @@ export default Vue.extend({
 		.text p i
 			color #53c7ce
 
+	&.receiveFollowRequest
+		.text p i
+			color #888
+
 	&.reply, &.mention
 		.text p i
 			color #fff

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

@@ -40,6 +40,17 @@
 		</div>
 	</div>
 
+	<div class="notification followRequest" v-if="notification.type == 'receiveFollowRequest'">
+		<mk-avatar class="avatar" :user="notification.user"/>
+		<div>
+			<header>
+				%fa:user-clock%
+				<router-link :to="notification.user | userPage">{{ notification.user | userName }}</router-link>
+				<mk-time :time="notification.createdAt"/>
+			</header>
+		</div>
+	</div>
+
 	<div class="notification poll_vote" v-if="notification.type == 'poll_vote'">
 		<mk-avatar class="avatar" :user="notification.user"/>
 		<div>
@@ -55,15 +66,15 @@
 	</div>
 
 	<template v-if="notification.type == 'quote'">
-		<mk-note :note="notification.note"/>
+		<mk-note :note="notification.note" @update:note="onNoteUpdated"/>
 	</template>
 
 	<template v-if="notification.type == 'reply'">
-		<mk-note :note="notification.note"/>
+		<mk-note :note="notification.note" @update:note="onNoteUpdated"/>
 	</template>
 
 	<template v-if="notification.type == 'mention'">
-		<mk-note :note="notification.note"/>
+		<mk-note :note="notification.note" @update:note="onNoteUpdated"/>
 	</template>
 </div>
 </template>
@@ -78,6 +89,17 @@ export default Vue.extend({
 		return {
 			getNoteSummary
 		};
+	},
+	methods: {
+		onNoteUpdated(note) {
+			switch (this.notification.type) {
+				case 'quote':
+				case 'reply':
+				case 'mention':
+					Vue.set(this.notification, 'note', note);
+					break;
+			}
+		}
 	}
 });
 </script>
@@ -156,6 +178,10 @@ root(isDark)
 			> div > header i
 				color #53c7ce
 
+		&.receiveFollowRequest
+			> div > header i
+				color #888
+
 .mk-notification[data-darkmode]
 	root(true)
 

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

@@ -15,21 +15,22 @@
 			</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="/" :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="hasUnreadMessagingMessages">%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%ゲーム<template v-if="hasGameInvitations">%fa:circle%</template>%fa:angle-right%</router-link></li>
+					<li v-if="$store.getters.isSignedIn && $store.state.i.isLocked"><router-link to="/i/received-follow-requests" :data-active="$route.name == 'received-follow-requests'">%fa:R envelope%%i18n:@follow-requests%<template v-if="$store.getters.isSignedIn && $store.state.i.pendingReceivedFollowRequestsCount">%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>
@@ -158,7 +159,10 @@ root(isDark)
 		&:first-child
 			margin-top 0
 
-		li
+		&:last-child
+			margin-bottom 0
+
+		> li
 			display block
 			font-size 1em
 			line-height 1em
@@ -181,6 +185,8 @@ root(isDark)
 
 				> [data-fa]:first-child
 					margin-right 0.5em
+					width 20px
+					text-align center
 
 				> [data-fa].circle
 					margin-left 6px
@@ -198,7 +204,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/received-follow-requests.vue

@@ -0,0 +1,78 @@
+<template>
+<mk-ui>
+	<span slot="header">%fa:envelope R%%i18n:@title%</span>
+
+	<main>
+		<div v-for="req in requests">
+			<router-link :key="req.id" :to="req.follower | userPage">{{ req.follower | userName }}</router-link>
+			<span>
+				<a @click="accept(req.follower)">%i18n:@accept%</a>|<a @click="reject(req.follower)">%i18n:@reject%</a>
+			</span>
+		</div>
+	</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,
+			requests: []
+		};
+	},
+	mounted() {
+		document.title = 'Misskey | %i18n:@title%';
+
+		Progress.start();
+
+		(this as any).api('following/requests/list').then(requests => {
+			this.fetching = false;
+			this.requests = requests;
+
+			Progress.done();
+		});
+	},
+	methods: {
+		accept(user) {
+			(this as any).api('following/requests/accept', { userId: user.id }).then(() => {
+				this.requests = this.requests.filter(r => r.follower.id != user.id);
+			});
+		},
+		reject(user) {
+			(this as any).api('following/requests/reject', { userId: user.id }).then(() => {
+				this.requests = this.requests.filter(r => r.follower.id != user.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
+
+	> div
+		display flex
+		padding 16px
+		border solid 1px isDark ? #1c2023 : #eee
+		border-radius 4px
+
+		> span
+			margin 0 0 0 auto
+
+</style>

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

@@ -0,0 +1,70 @@
+<template>
+<mk-ui>
+	<span slot="header" v-if="!fetching">%fa:list%{{ list.title }}</span>
+
+	<main v-if="!fetching">
+		<ul>
+			<li v-for="user in 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,
+			users: 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();
+
+				(this as any).api('users/show', {
+					userIds: this.list.userIds
+				}).then(users => {
+					this.users = users;
+				});
+			});
+		}
+	}
+});
+</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/user.vue

@@ -184,7 +184,6 @@ root(isDark)
 
 				> .mk-follow-button
 					float right
-					height 40px
 
 			> .title
 				margin 8px 0

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/follow-request.ts

@@ -0,0 +1,87 @@
+import * as mongo from 'mongodb';
+import * as deepcopy from 'deepcopy';
+import db from '../db/mongodb';
+import { pack as packUser } from './user';
+
+const FollowRequest = db.get<IFollowRequest>('followRequests');
+FollowRequest.createIndex(['followerId', 'followeeId'], { unique: true });
+export default FollowRequest;
+
+export type IFollowRequest = {
+	_id: mongo.ObjectID;
+	createdAt: Date;
+	followeeId: mongo.ObjectID;
+	followerId: mongo.ObjectID;
+
+	// 非正規化
+	_followee: {
+		host: string;
+		inbox?: string;
+	},
+	_follower: {
+		host: string;
+		inbox?: string;
+	}
+};
+
+/**
+ * FollowRequestを物理削除します
+ */
+export async function deleteFollowRequest(followRequest: string | mongo.ObjectID | IFollowRequest) {
+	let f: IFollowRequest;
+
+	// Populate
+	if (mongo.ObjectID.prototype.isPrototypeOf(followRequest)) {
+		f = await FollowRequest.findOne({
+			_id: followRequest
+		});
+	} else if (typeof followRequest === 'string') {
+		f = await FollowRequest.findOne({
+			_id: new mongo.ObjectID(followRequest)
+		});
+	} else {
+		f = followRequest as IFollowRequest;
+	}
+
+	if (f == null) return;
+
+	// このFollowingを削除
+	await FollowRequest.remove({
+		_id: f._id
+	});
+}
+
+/**
+ * Pack a request for API response
+ */
+export const pack = (
+	request: any,
+	me?: any
+) => new Promise<any>(async (resolve, reject) => {
+	let _request: any;
+
+	// Populate the request if 'request' is ID
+	if (mongo.ObjectID.prototype.isPrototypeOf(request)) {
+		_request = await FollowRequest.findOne({
+			_id: request
+		});
+	} else if (typeof request === 'string') {
+		_request = await FollowRequest.findOne({
+			_id: new mongo.ObjectID(request)
+		});
+	} else {
+		_request = deepcopy(request);
+	}
+
+	// Rename _id to id
+	_request.id = _request._id;
+	delete _request._id;
+
+	// Populate follower
+	_request.follower = await packUser(_request.followerId, me);
+
+	// Populate followee
+	_request.followee = await packUser(_request.followeeId, me);
+
+	resolve(_request);
+});

src/models/notification.ts

@@ -111,6 +111,7 @@ export const pack = (notification: any) => new Promise<any>(async (resolve, reje
 
 	switch (_notification.type) {
 		case 'follow':
+		case 'receiveFollowRequest':
 			// nope
 			break;
 		case 'mention':

src/models/user.ts

@@ -22,6 +22,7 @@ import FollowedLog, { deleteFollowedLog } from './followed-log';
 import SwSubscription, { deleteSwSubscription } from './sw-subscription';
 import Notification, { deleteNotification } from './notification';
 import UserList, { deleteUserList } from './user-list';
+import FollowRequest, { deleteFollowRequest } from './follow-request';
 
 const User = db.get<IUser>('users');
 
@@ -50,7 +51,22 @@ type IUserBase = {
 	data: any;
 	description: string;
 	pinnedNoteId: mongo.ObjectID;
+
+	/**
+	 * 凍結されているか否か
+	 */
 	isSuspended: boolean;
+
+	/**
+	 * 鍵アカウントか否か
+	 */
+	isLocked: boolean;
+
+	/**
+	 * このアカウントに届いているフォローリクエストの数
+	 */
+	pendingReceivedFollowRequestsCount: number;
+
 	host: string;
 };
 
@@ -240,6 +256,16 @@ export async function deleteUser(user: string | mongo.ObjectID | IUser) {
 		await Following.find({ followeeId: u._id })
 	).map(x => deleteFollowing(x)));
 
+	// このユーザーのFollowRequestをすべて削除
+	await Promise.all((
+		await FollowRequest.find({ followerId: u._id })
+	).map(x => deleteFollowRequest(x)));
+
+	// このユーザーへのFollowRequestをすべて削除
+	await Promise.all((
+		await FollowRequest.find({ followeeId: u._id })
+	).map(x => deleteFollowRequest(x)));
+
 	// このユーザーのFollowingLogをすべて削除
 	await Promise.all((
 		await FollowingLog.find({ userId: u._id })
@@ -395,7 +421,7 @@ export const pack = (
 	}
 
 	if (meId && !meId.equals(_user.id)) {
-		const [following1, following2, mute] = await Promise.all([
+		const [following1, following2, followReq1, followReq2, mute] = await Promise.all([
 			Following.findOne({
 				followerId: meId,
 				followeeId: _user.id
@@ -404,6 +430,14 @@ export const pack = (
 				followerId: _user.id,
 				followeeId: meId
 			}),
+			_user.isLocked ? FollowRequest.findOne({
+				followerId: meId,
+				followeeId: _user.id
+			}) : Promise.resolve(null),
+			FollowRequest.findOne({
+				followerId: _user.id,
+				followeeId: meId
+			}),
 			Mute.findOne({
 				muterId: meId,
 				muteeId: _user.id
@@ -414,6 +448,9 @@ export const pack = (
 		_user.isFollowing = following1 !== null;
 		_user.isStalking = following1 && following1.stalk;
 
+		_user.hasPendingFollowRequestFromYou = followReq1 !== null;
+		_user.hasPendingFollowRequestToYou = followReq2 !== null;
+
 		// Whether the user is followed
 		_user.isFollowed = following2 !== null;
 

src/remote/activitypub/kernel/accept/follow.ts

@@ -0,0 +1,27 @@
+import * as mongo from 'mongodb';
+import User, { IRemoteUser } from '../../../../models/user';
+import config from '../../../../config';
+import accept from '../../../../services/following/requests/accept';
+import { IFollow } from '../../type';
+
+export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
+	const id = typeof activity.object == 'string' ? activity.object : activity.object.id;
+
+	if (!id.startsWith(config.url + '/')) {
+		return null;
+	}
+
+	const follower = await User.findOne({
+		_id: new mongo.ObjectID(id.split('/').pop())
+	});
+
+	if (follower === null) {
+		throw new Error('follower not found');
+	}
+
+	if (follower.host != null) {
+		throw new Error('フォローリクエストしたユーザーはローカルユーザーではありません');
+	}
+
+	await accept(actor, follower);
+};

src/remote/activitypub/kernel/accept/index.ts

@@ -0,0 +1,35 @@
+import * as debug from 'debug';
+
+import Resolver from '../../resolver';
+import { IRemoteUser } from '../../../../models/user';
+import acceptFollow from './follow';
+import { IAccept } from '../../type';
+
+const log = debug('misskey:activitypub');
+
+export default async (actor: IRemoteUser, activity: IAccept): Promise<void> => {
+	const uri = activity.id || activity;
+
+	log(`Accept: ${uri}`);
+
+	const resolver = new Resolver();
+
+	let object;
+
+	try {
+		object = await resolver.resolve(activity.object);
+	} catch (e) {
+		log(`Resolution failed: ${e}`);
+		throw e;
+	}
+
+	switch (object.type) {
+	case 'Follow':
+		acceptFollow(actor, object);
+		break;
+
+	default:
+		console.warn(`Unknown accept type: ${object.type}`);
+		break;
+	}
+};

src/remote/activitypub/kernel/follow.ts

@@ -23,5 +23,5 @@ export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
 		throw new Error('フォローしようとしているユーザーはローカルユーザーではありません');
 	}
 
-	await follow(actor, followee, activity);
+	await follow(actor, followee);
 };

src/remote/activitypub/kernel/index.ts

@@ -6,6 +6,8 @@ import follow from './follow';
 import undo from './undo';
 import like from './like';
 import announce from './announce';
+import accept from './accept';
+import reject from './reject';
 
 const self = async (actor: IRemoteUser, activity: Object): Promise<void> => {
 	switch (activity.type) {
@@ -22,7 +24,11 @@ const self = async (actor: IRemoteUser, activity: Object): Promise<void> => {
 		break;
 
 	case 'Accept':
-		// noop
+		await accept(actor, activity);
+		break;
+
+	case 'Reject':
+		await reject(actor, activity);
 		break;
 
 	case 'Announce':

src/remote/activitypub/kernel/reject/follow.ts

@@ -0,0 +1,27 @@
+import * as mongo from 'mongodb';
+import User, { IRemoteUser } from '../../../../models/user';
+import config from '../../../../config';
+import reject from '../../../../services/following/requests/reject';
+import { IFollow } from '../../type';
+
+export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
+	const id = typeof activity.object == 'string' ? activity.object : activity.object.id;
+
+	if (!id.startsWith(config.url + '/')) {
+		return null;
+	}
+
+	const follower = await User.findOne({
+		_id: new mongo.ObjectID(id.split('/').pop())
+	});
+
+	if (follower === null) {
+		throw new Error('follower not found');
+	}
+
+	if (follower.host != null) {
+		throw new Error('フォローリクエストしたユーザーはローカルユーザーではありません');
+	}
+
+	await reject(actor, follower);
+};

src/remote/activitypub/kernel/reject/index.ts

@@ -0,0 +1,35 @@
+import * as debug from 'debug';
+
+import Resolver from '../../resolver';
+import { IRemoteUser } from '../../../../models/user';
+import rejectFollow from './follow';
+import { IReject } from '../../type';
+
+const log = debug('misskey:activitypub');
+
+export default async (actor: IRemoteUser, activity: IReject): Promise<void> => {
+	const uri = activity.id || activity;
+
+	log(`Reject: ${uri}`);
+
+	const resolver = new Resolver();
+
+	let object;
+
+	try {
+		object = await resolver.resolve(activity.object);
+	} catch (e) {
+		log(`Resolution failed: ${e}`);
+		throw e;
+	}
+
+	switch (object.type) {
+	case 'Follow':
+		rejectFollow(actor, object);
+		break;
+
+	default:
+		console.warn(`Unknown reject type: ${object.type}`);
+		break;
+	}
+};

src/remote/activitypub/kernel/undo/follow.ts

@@ -2,7 +2,9 @@ import * as mongo from 'mongodb';
 import User, { IRemoteUser } from '../../../../models/user';
 import config from '../../../../config';
 import unfollow from '../../../../services/following/delete';
+import cancelRequest from '../../../../services/following/requests/cancel';
 import { IFollow } from '../../type';
+import FollowRequest from '../../../../models/follow-request';
 
 export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
 	const id = typeof activity.object == 'string' ? activity.object : activity.object.id;
@@ -23,5 +25,14 @@ export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
 		throw new Error('フォロー解除しようとしているユーザーはローカルユーザーではありません');
 	}
 
-	await unfollow(actor, followee, activity);
+	const req = await FollowRequest.findOne({
+		followerId: actor._id,
+		followeeId: followee._id
+	});
+
+	if (req) {
+		await cancelRequest(actor, followee);
+	} else {
+		await unfollow(actor, followee);
+	}
 };

src/remote/activitypub/models/person.ts

@@ -93,6 +93,7 @@ export async function createPerson(value: any, resolver?: Resolver): Promise<IUs
 			notesCount,
 			name: person.name,
 			driveCapacity: 1024 * 1024 * 8, // 8MiB
+			isLocked: person.manuallyApprovesFollowers,
 			username: person.preferredUsername,
 			usernameLower: person.preferredUsername.toLowerCase(),
 			host,

src/remote/activitypub/renderer/follow.ts

@@ -1,8 +1,8 @@
 import config from '../../../config';
-import { IRemoteUser, ILocalUser } from '../../../models/user';
+import { IUser, isLocalUser } from '../../../models/user';
 
-export default (follower: ILocalUser, followee: IRemoteUser) => ({
+export default (follower: IUser, followee: IUser) => ({
 	type: 'Follow',
-	actor: `${config.url}/users/${follower._id}`,
+	actor: isLocalUser(follower) ? `${config.url}/users/${follower._id}` : follower.uri,
-	object: followee.uri
+	object: isLocalUser(followee) ? `${config.url}/users/${followee._id}` : followee.uri
 });

src/remote/activitypub/renderer/person.ts

@@ -1,8 +1,9 @@
 import renderImage from './image';
 import renderKey from './key';
 import config from '../../../config';
+import { ILocalUser } from '../../../models/user';
 
-export default user => {
+export default (user: ILocalUser) => {
 	const id = `${config.url}/users/${user._id}`;
 
 	return {
@@ -17,6 +18,7 @@ export default user => {
 		summary: user.description,
 		icon: user.avatarId && renderImage({ _id: user.avatarId }),
 		image: user.bannerId && renderImage({ _id: user.bannerId }),
+		manuallyApprovesFollowers: user.isLocked,
 		publicKey: renderKey(user)
 	};
 };

src/remote/activitypub/renderer/reject.ts

@@ -0,0 +1,4 @@
+export default object => ({
+	type: 'Reject',
+	object
+});

src/remote/activitypub/type.ts

@@ -45,6 +45,7 @@ export interface IPerson extends IObject {
 	type: 'Person';
 	name: string;
 	preferredUsername: string;
+	manuallyApprovesFollowers: boolean;
 	inbox: string;
 	publicKey: any;
 	followers: any;
@@ -82,6 +83,10 @@ export interface IAccept extends IActivity {
 	type: 'Accept';
 }
 
+export interface IReject extends IActivity {
+	type: 'Reject';
+}
+
 export interface ILike extends IActivity {
 	type: 'Like';
 	_misskey_reaction: string;
@@ -99,5 +104,6 @@ export type Object =
 	IUndo |
 	IFollow |
 	IAccept |
+	IReject |
 	ILike |
 	IAnnounce;

src/server/activitypub.ts

@@ -7,7 +7,7 @@ const httpSignature = require('http-signature');
 import { createHttp } from '../queue';
 import pack from '../remote/activitypub/renderer';
 import Note from '../models/note';
-import User, { isLocalUser } from '../models/user';
+import User, { isLocalUser, ILocalUser } from '../models/user';
 import renderNote from '../remote/activitypub/renderer/note';
 import renderKey from '../remote/activitypub/renderer/key';
 import renderPerson from '../remote/activitypub/renderer/person';
@@ -69,7 +69,10 @@ router.get('/notes/:note', async (ctx, next) => {
 router.get('/users/:user/outbox', async ctx => {
 	const userId = new mongo.ObjectID(ctx.params.user);
 
-	const user = await User.findOne({ _id: userId });
+	const user = await User.findOne({
+		_id: userId,
+		host: null
+	});
 
 	if (user === null) {
 		ctx.status = 404;
@@ -91,7 +94,10 @@ router.get('/users/:user/outbox', async ctx => {
 router.get('/users/:user/publickey', async ctx => {
 	const userId = new mongo.ObjectID(ctx.params.user);
 
-	const user = await User.findOne({ _id: userId });
+	const user = await User.findOne({
+		_id: userId,
+		host: null
+	});
 
 	if (user === null) {
 		ctx.status = 404;
@@ -109,14 +115,17 @@ router.get('/users/:user/publickey', async ctx => {
 router.get('/users/:user', async ctx => {
 	const userId = new mongo.ObjectID(ctx.params.user);
 
-	const user = await User.findOne({ _id: userId });
+	const user = await User.findOne({
+		_id: userId,
+		host: null
+	});
 
 	if (user === null) {
 		ctx.status = 404;
 		return;
 	}
 
-	ctx.body = pack(renderPerson(user));
+	ctx.body = pack(renderPerson(user as ILocalUser));
 });
 
 // follow form

src/server/api/endpoints.ts

@@ -448,6 +448,26 @@ const endpoints: Endpoint[] = [
 		},
 		kind: 'following-write'
 	},
+	{
+		name: 'following/requests/accept',
+		withCredential: true,
+		kind: 'following-write'
+	},
+	{
+		name: 'following/requests/reject',
+		withCredential: true,
+		kind: 'following-write'
+	},
+	{
+		name: 'following/requests/cancel',
+		withCredential: true,
+		kind: 'following-write'
+	},
+	{
+		name: 'following/requests/list',
+		withCredential: true,
+		kind: 'following-read'
+	},
 	{
 		name: 'following/stalk',
 		withCredential: true,
@@ -555,7 +575,7 @@ const endpoints: Endpoint[] = [
 		withCredential: true,
 		limit: {
 			duration: ms('1hour'),
-			max: 100
+			max: 300
 		},
 		kind: 'reaction-write'
 	},

src/server/api/endpoints/following/create.ts

@@ -2,7 +2,7 @@
  * Module dependencies
  */
 import $ from 'cafy'; import ID from '../../../../cafy-id';
-import User from '../../../../models/user';
+import User, { pack } from '../../../../models/user';
 import Following from '../../../../models/following';
 import create from '../../../../services/following/create';
 
@@ -49,5 +49,5 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	create(follower, followee);
 
 	// Send response
-	res();
+	res(await pack(followee._id, user));
 });

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

@@ -2,7 +2,7 @@
  * Module dependencies
  */
 import $ from 'cafy'; import ID from '../../../../cafy-id';
-import User from '../../../../models/user';
+import User, { pack } from '../../../../models/user';
 import Following from '../../../../models/following';
 import deleteFollowing from '../../../../services/following/delete';
 
@@ -49,5 +49,5 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	deleteFollowing(follower, followee);
 
 	// Send response
-	res();
+	res(await pack(followee._id, user));
 });

src/server/api/endpoints/following/requests/accept.ts

@@ -0,0 +1,26 @@
+import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import acceptFollowRequest from '../../../../../services/following/requests/accept';
+import User from '../../../../../models/user';
+
+/**
+ * Accept a follow request
+ */
+module.exports = (params, user) => new Promise(async (res, rej) => {
+	// Get 'userId' parameter
+	const [followerId, followerIdErr] = $.type(ID).get(params.userId);
+	if (followerIdErr) return rej('invalid userId param');
+
+	// Fetch follower
+	const follower = await User.findOne({
+		_id: followerId
+	});
+
+	if (follower === null) {
+		return rej('follower not found');
+	}
+
+	await acceptFollowRequest(user, follower);
+
+	// Send response
+	res();
+});

src/server/api/endpoints/following/requests/cancel.ts

@@ -0,0 +1,26 @@
+import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import cancelFollowRequest from '../../../../../services/following/requests/cancel';
+import User, { pack } from '../../../../../models/user';
+
+/**
+ * Cancel a follow request
+ */
+module.exports = (params, user) => new Promise(async (res, rej) => {
+	// Get 'userId' parameter
+	const [followeeId, followeeIdErr] = $.type(ID).get(params.userId);
+	if (followeeIdErr) return rej('invalid userId param');
+
+	// Fetch followee
+	const followee = await User.findOne({
+		_id: followeeId
+	});
+
+	if (followee === null) {
+		return rej('followee not found');
+	}
+
+	await cancelFollowRequest(followee, user);
+
+	// Send response
+	res(await pack(followee._id, user));
+});

src/server/api/endpoints/following/requests/list.ts

@@ -0,0 +1,14 @@
+//import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import FollowRequest, { pack } from '../../../../../models/follow-request';
+
+/**
+ * Get all pending received follow requests
+ */
+module.exports = (params, user) => new Promise(async (res, rej) => {
+	const reqs = await FollowRequest.find({
+		followeeId: user._id
+	});
+
+	// Send response
+	res(await Promise.all(reqs.map(req => pack(req))));
+});

src/server/api/endpoints/following/requests/reject.ts

@@ -0,0 +1,26 @@
+import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import rejectFollowRequest from '../../../../../services/following/requests/reject';
+import User from '../../../../../models/user';
+
+/**
+ * Reject a follow request
+ */
+module.exports = (params, user) => new Promise(async (res, rej) => {
+	// Get 'userId' parameter
+	const [followerId, followerIdErr] = $.type(ID).get(params.userId);
+	if (followerIdErr) return rej('invalid userId param');
+
+	// Fetch follower
+	const follower = await User.findOne({
+		_id: followerId
+	});
+
+	if (follower === null) {
+		return rej('follower not found');
+	}
+
+	await rejectFollowRequest(user, follower);
+
+	// Send response
+	res();
+});

src/server/api/endpoints/i/update.ts

@@ -5,6 +5,7 @@ import $ from 'cafy'; import ID from '../../../../cafy-id';
 import User, { isValidName, isValidDescription, isValidLocation, isValidBirthday, pack } from '../../../../models/user';
 import event from '../../../../publishers/stream';
 import DriveFile from '../../../../models/drive-file';
+import acceptAllFollowRequests from '../../../../services/following/requests/accept-all';
 
 /**
  * Update myself
@@ -12,50 +13,57 @@ import DriveFile from '../../../../models/drive-file';
 module.exports = async (params, user, app) => new Promise(async (res, rej) => {
 	const isSecure = user != null && app == null;
 
+	const updates = {} as any;
+
 	// Get 'name' parameter
 	const [name, nameErr] = $.str.optional().nullable().pipe(isValidName).get(params.name);
 	if (nameErr) return rej('invalid name param');
-	if (name) user.name = name;
+	if (name) updates.name = name;
 
 	// Get 'description' parameter
 	const [description, descriptionErr] = $.str.optional().nullable().pipe(isValidDescription).get(params.description);
 	if (descriptionErr) return rej('invalid description param');
-	if (description !== undefined) user.description = description;
+	if (description !== undefined) updates.description = description;
 
 	// Get 'location' parameter
 	const [location, locationErr] = $.str.optional().nullable().pipe(isValidLocation).get(params.location);
 	if (locationErr) return rej('invalid location param');
-	if (location !== undefined) user.profile.location = location;
+	if (location !== undefined) updates['profile.location'] = location;
 
 	// Get 'birthday' parameter
 	const [birthday, birthdayErr] = $.str.optional().nullable().pipe(isValidBirthday).get(params.birthday);
 	if (birthdayErr) return rej('invalid birthday param');
-	if (birthday !== undefined) user.profile.birthday = birthday;
+	if (birthday !== undefined) updates['profile.birthday'] = birthday;
 
 	// Get 'avatarId' parameter
-	const [avatarId, avatarIdErr] = $.type(ID).optional().get(params.avatarId);
+	const [avatarId, avatarIdErr] = $.type(ID).optional().nullable().get(params.avatarId);
 	if (avatarIdErr) return rej('invalid avatarId param');
-	if (avatarId) user.avatarId = avatarId;
+	if (avatarId !== undefined) updates.avatarId = avatarId;
 
 	// Get 'bannerId' parameter
-	const [bannerId, bannerIdErr] = $.type(ID).optional().get(params.bannerId);
+	const [bannerId, bannerIdErr] = $.type(ID).optional().nullable().get(params.bannerId);
 	if (bannerIdErr) return rej('invalid bannerId param');
-	if (bannerId) user.bannerId = bannerId;
+	if (bannerId !== undefined) updates.bannerId = bannerId;
+
+	// Get 'isLocked' parameter
+	const [isLocked, isLockedErr] = $.bool.optional().get(params.isLocked);
+	if (isLockedErr) return rej('invalid isLocked param');
+	if (isLocked != null) updates.isLocked = isLocked;
 
 	// Get 'isBot' parameter
 	const [isBot, isBotErr] = $.bool.optional().get(params.isBot);
 	if (isBotErr) return rej('invalid isBot param');
-	if (isBot != null) user.isBot = isBot;
+	if (isBot != null) updates.isBot = isBot;
 
 	// Get 'isCat' parameter
 	const [isCat, isCatErr] = $.bool.optional().get(params.isCat);
 	if (isCatErr) return rej('invalid isCat param');
-	if (isCat != null) user.isCat = isCat;
+	if (isCat != null) updates.isCat = isCat;
 
 	// Get 'autoWatch' parameter
 	const [autoWatch, autoWatchErr] = $.bool.optional().get(params.autoWatch);
 	if (autoWatchErr) return rej('invalid autoWatch param');
-	if (autoWatch != null) user.settings.autoWatch = autoWatch;
+	if (autoWatch != null) updates['settings.autoWatch'] = autoWatch;
 
 	if (avatarId) {
 		const avatar = await DriveFile.findOne({
@@ -63,7 +71,7 @@ module.exports = async (params, user, app) => new Promise(async (res, rej) => {
 		});
 
 		if (avatar != null && avatar.metadata.properties.avgColor) {
-			user.avatarColor = avatar.metadata.properties.avgColor;
+			updates.avatarColor = avatar.metadata.properties.avgColor;
 		}
 	}
 
@@ -73,27 +81,16 @@ module.exports = async (params, user, app) => new Promise(async (res, rej) => {
 		});
 
 		if (banner != null && banner.metadata.properties.avgColor) {
-			user.bannerColor = banner.metadata.properties.avgColor;
+			updates.bannerColor = banner.metadata.properties.avgColor;
 		}
 	}
 
 	await User.update(user._id, {
-		$set: {
+		$set: updates
-			name: user.name,
-			description: user.description,
-			avatarId: user.avatarId,
-			avatarColor: user.avatarColor,
-			bannerId: user.bannerId,
-			bannerColor: user.bannerColor,
-			profile: user.profile,
-			isBot: user.isBot,
-			isCat: user.isCat,
-			settings: user.settings
-		}
 	});
 
 	// Serialize
-	const iObj = await pack(user, user, {
+	const iObj = await pack(user._id, user, {
 		detail: true,
 		includeSecrets: isSecure
 	});
@@ -101,6 +98,11 @@ module.exports = async (params, user, app) => new Promise(async (res, rej) => {
 	// Send response
 	res(iObj);
 
-	// Publish i updated event
+	// Publish meUpdated event
-	event(user._id, 'i_updated', iObj);
+	event(user._id, 'meUpdated', iObj);
+
+	// 鍵垢を解除したとき、溜まっていたフォローリクエストがあるならすべて承認
+	if (user.isLocked && isLocked === false) {
+		acceptAllFollowRequests(user);
+	}
 });

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

@@ -26,7 +26,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 		return rej('note not found');
 	}
 
-	const ids = note._replyIds.slice(offset, offset + limit);
+	const ids = (note._replyIds || []).slice(offset, offset + limit);
 
 	// Serialize
 	res(await Promise.all(ids.map(id => pack(id, user))));

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

@@ -36,6 +36,7 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
 			_id: {
 				$nin: followingIds.concat(mutedUserIds)
 			},
+			isLocked: false,
 			$or: [{
 				lastUsedAt: {
 					$gte: new Date(Date.now() - ms('7days'))

src/server/api/service/twitter.ts

@@ -49,7 +49,7 @@ router.get('/disconnect/twitter', async ctx => {
 	ctx.body = `Twitterの連携を解除しました :v:`;
 
 	// Publish i updated event
-	event(user._id, 'i_updated', await pack(user, user, {
+	event(user._id, 'meUpdated', await pack(user, user, {
 		detail: true,
 		includeSecrets: true
 	}));
@@ -174,7 +174,7 @@ if (config.twitter == null) {
 			ctx.body = `Twitter: @${result.screenName} を、Misskey: @${user.username} に接続しました！`;
 
 			// Publish i updated event
-			event(user._id, 'i_updated', await pack(user, user, {
+			event(user._id, 'meUpdated', await pack(user, user, {
 				detail: true,
 				includeSecrets: true
 			}));

src/services/following/create.ts

@@ -8,13 +8,16 @@ import pack from '../../remote/activitypub/renderer';
 import renderFollow from '../../remote/activitypub/renderer/follow';
 import renderAccept from '../../remote/activitypub/renderer/accept';
 import { deliver } from '../../queue';
+import createFollowRequest from './requests/create';
 
-export default async function(follower: IUser, followee: IUser, activity?) {
+export default async function(follower: IUser, followee: IUser) {
+	if (followee.isLocked) {
+		await createFollowRequest(follower, followee);
+	} else {
 		const following = await Following.insert({
 			createdAt: new Date(),
 			followerId: follower._id,
 			followeeId: followee._id,
-		stalk: true,
 
 			// 非正規化
 			_follower: {
@@ -73,7 +76,8 @@ export default async function(follower: IUser, followee: IUser, activity?) {
 		}
 
 		if (isRemoteUser(follower) && isLocalUser(followee)) {
-		const content = pack(renderAccept(activity));
+			const content = pack(renderAccept(renderFollow(follower, followee)));
 			deliver(followee, content, follower.inbox);
 		}
+	}
 }

src/services/following/delete.ts

@@ -8,7 +8,7 @@ import renderFollow from '../../remote/activitypub/renderer/follow';
 import renderUndo from '../../remote/activitypub/renderer/undo';
 import { deliver } from '../../queue';
 
-export default async function(follower: IUser, followee: IUser, activity?) {
+export default async function(follower: IUser, followee: IUser) {
 	const following = await Following.findOne({
 		followerId: follower._id,
 		followeeId: followee._id

src/services/following/requests/accept-all.ts

@@ -0,0 +1,24 @@
+import User, { IUser } from "../../../models/user";
+import FollowRequest from "../../../models/follow-request";
+import accept from './accept';
+
+/**
+ * 指定したユーザー宛てのフォローリクエストをすべて承認
+ * @param user ユーザー
+ */
+export default async function(user: IUser) {
+	const requests = await FollowRequest.find({
+		followeeId: user._id
+	});
+
+	requests.forEach(async request => {
+		const follower = await User.findOne({ _id: request.followerId });
+		accept(user, follower);
+	});
+
+	User.update({ _id: user._id }, {
+		$set: {
+			pendingReceivedFollowRequestsCount: 0
+		}
+	});
+}

src/services/following/requests/accept.ts

@@ -0,0 +1,70 @@
+import User, { IUser, isRemoteUser, ILocalUser, pack as packUser } from "../../../models/user";
+import FollowRequest from "../../../models/follow-request";
+import pack from '../../../remote/activitypub/renderer';
+import renderFollow from '../../../remote/activitypub/renderer/follow';
+import renderAccept from '../../../remote/activitypub/renderer/accept';
+import { deliver } from '../../../queue';
+import Following from "../../../models/following";
+import FollowingLog from "../../../models/following-log";
+import FollowedLog from "../../../models/followed-log";
+import event from '../../../publishers/stream';
+
+export default async function(followee: IUser, follower: IUser) {
+	const following = await Following.insert({
+		createdAt: new Date(),
+		followerId: follower._id,
+		followeeId: followee._id,
+
+		// 非正規化
+		_follower: {
+			host: follower.host,
+			inbox: isRemoteUser(follower) ? follower.inbox : undefined
+		},
+		_followee: {
+			host: followee.host,
+			inbox: isRemoteUser(followee) ? followee.inbox : undefined
+		}
+	});
+
+	if (isRemoteUser(follower)) {
+		const content = pack(renderAccept(renderFollow(follower, followee)));
+		deliver(followee as ILocalUser, content, follower.inbox);
+	}
+
+	await FollowRequest.remove({
+		followeeId: followee._id,
+		followerId: follower._id
+	});
+
+	//#region Increment following count
+	await User.update({ _id: follower._id }, {
+		$inc: {
+			followingCount: 1
+		}
+	});
+
+	FollowingLog.insert({
+		createdAt: following.createdAt,
+		userId: follower._id,
+		count: follower.followingCount + 1
+	});
+	//#endregion
+
+	//#region Increment followers count
+	await User.update({ _id: followee._id }, {
+		$inc: {
+			followersCount: 1
+		}
+	});
+
+	FollowedLog.insert({
+		createdAt: following.createdAt,
+		userId: followee._id,
+		count: followee.followersCount + 1
+	});
+	//#endregion
+
+	packUser(followee, followee, {
+		detail: true
+	}).then(packed => event(followee._id, 'meUpdated', packed));
+}

src/services/following/requests/cancel.ts

@@ -0,0 +1,29 @@
+import User, { IUser, isRemoteUser, ILocalUser, pack as packUser } from "../../../models/user";
+import FollowRequest from "../../../models/follow-request";
+import pack from '../../../remote/activitypub/renderer';
+import renderFollow from '../../../remote/activitypub/renderer/follow';
+import renderUndo from '../../../remote/activitypub/renderer/undo';
+import { deliver } from '../../../queue';
+import event from '../../../publishers/stream';
+
+export default async function(followee: IUser, follower: IUser) {
+	if (isRemoteUser(followee)) {
+		const content = pack(renderUndo(renderFollow(follower, followee)));
+		deliver(follower as ILocalUser, content, followee.inbox);
+	}
+
+	await FollowRequest.remove({
+		followeeId: followee._id,
+		followerId: follower._id
+	});
+
+	await User.update({ _id: followee._id }, {
+		$inc: {
+			pendingReceivedFollowRequestsCount: -1
+		}
+	});
+
+	packUser(followee, followee, {
+		detail: true
+	}).then(packed => event(followee._id, 'meUpdated', packed));
+}

src/services/following/requests/create.ts

@@ -0,0 +1,50 @@
+import User, { isLocalUser, isRemoteUser, pack as packUser, IUser } from '../../../models/user';
+import event from '../../../publishers/stream';
+import notify from '../../../publishers/notify';
+import pack from '../../../remote/activitypub/renderer';
+import renderFollow from '../../../remote/activitypub/renderer/follow';
+import { deliver } from '../../../queue';
+import FollowRequest from '../../../models/follow-request';
+
+export default async function(follower: IUser, followee: IUser) {
+	if (!followee.isLocked) throw '対象のアカウントは鍵アカウントではありません';
+
+	await FollowRequest.insert({
+		createdAt: new Date(),
+		followerId: follower._id,
+		followeeId: followee._id,
+
+		// 非正規化
+		_follower: {
+			host: follower.host,
+			inbox: isRemoteUser(follower) ? follower.inbox : undefined
+		},
+		_followee: {
+			host: followee.host,
+			inbox: isRemoteUser(followee) ? followee.inbox : undefined
+		}
+	});
+
+	await User.update({ _id: followee._id }, {
+		$inc: {
+			pendingReceivedFollowRequestsCount: 1
+		}
+	});
+
+	// Publish receiveRequest event
+	if (isLocalUser(followee)) {
+		packUser(follower, followee).then(packed => event(followee._id, 'receiveFollowRequest', packed));
+
+		packUser(followee, followee, {
+			detail: true
+		}).then(packed => event(followee._id, 'meUpdated', packed));
+
+		// 通知を作成
+		notify(followee._id, follower._id, 'receiveFollowRequest');
+	}
+
+	if (isLocalUser(follower) && isRemoteUser(followee)) {
+		const content = pack(renderFollow(follower, followee));
+		deliver(follower, content, followee.inbox);
+	}
+}

src/services/following/requests/reject.ts

@@ -0,0 +1,24 @@
+import User, { IUser, isRemoteUser, ILocalUser } from "../../../models/user";
+import FollowRequest from "../../../models/follow-request";
+import pack from '../../../remote/activitypub/renderer';
+import renderFollow from '../../../remote/activitypub/renderer/follow';
+import renderReject from '../../../remote/activitypub/renderer/reject';
+import { deliver } from '../../../queue';
+
+export default async function(followee: IUser, follower: IUser) {
+	if (isRemoteUser(follower)) {
+		const content = pack(renderReject(renderFollow(follower, followee)));
+		deliver(followee as ILocalUser, content, follower.inbox);
+	}
+
+	await FollowRequest.remove({
+		followeeId: followee._id,
+		followerId: follower._id
+	});
+
+	User.update({ _id: followee._id }, {
+		$inc: {
+			pendingReceivedFollowRequestsCount: -1
+		}
+	});
+}