6.0.0

Merge pull request #2251 from syuilo/provide-thumbnails
Provide drive file thumbnails
2018-08-16 08:02:50 +09:00 · 2018-08-16 07:59:16 +09:00 · 2018-08-16 07:58:56 +09:00 · 2018-08-16 07:56:53 +09:00 · 2018-08-16 07:31:58 +09:00 · 2018-08-15 22:26:17 +00:00
89 changed files with 1546 additions and 380 deletions
--- a/.config/example.yml
+++ b/.config/example.yml
@ -50,8 +50,11 @@ remoteDriveCapacityMb: 8
 # If enabled:
 #  Server will not cache remote files (Using direct link instead).
 #  You can save your storage.
-#  Users cannot see remote images when they turn off "Show media from a remote server" setting.
-preventCache: false
+#
+#  NOTE:
+#  * Users cannot see remote images when they turn off "Show media from a remote server" setting.
+#  * Since thumbnails are not provided, traffic increases.
+preventCacheRemoteFiles: false

 drive:
  storage: 'db'
@ -64,7 +67,7 @@ drive:
  # config:
  #   endPoint:
  #   port:
-  #   secure:
+  #   useSSL:
  #   accessKey:
  #   secretKey:

@ -75,7 +78,7 @@ drive:
  # config:
  #   endPoint: s3-us-west-2.amazonaws.com
  #   region: us-west-2
-  #   secure: true
+  #   useSSL: true
  #   accessKey: XXX
  #   secretKey: YYY

@ -87,7 +90,7 @@ drive:
  # config:
  #   endPoint: s3-us-west-2.amazonaws.com
  #   region: us-west-2
-  #   secure: true
+  #   useSSL: true
  #   accessKey: XXX
  #   secretKey: YYY

@ -123,6 +126,7 @@ drive:
 # google_maps_api_key: example-google-maps-api-key

 # Twitter integration
+# You need to set the oauth callback url as : https://<your-misskey-instance>/api/tw/cb
 # twitter:
 #   consumer_key: example-twitter-consumer-key
 #   consumer_secret: example-twitter-consumer-secret-key
--- a/.travis.yml
+++ b/.travis.yml
@ -22,7 +22,6 @@ addons:
      - ubuntu-toolchain-r-test
    packages:
      - g++-4.8
-      - graphicsmagick

 cache:
  directories:
--- a/.vsls.json
+++ b/.vsls.json
@ -0,0 +1,4 @@
+{
+	"$schema": "http://json.schemastore.org/vsls",
+	"gitignore": "exclude"
+}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,6 +5,15 @@ ChangeLog

 This document describes breaking changes only.

+6.0.0
+-----
+
+### Migration
+
+オブジェクトストレージを使用している場合、設定ファイルの`drive.config.secure`を`drive.config.useSSL`にリネームしてください。
+
+If you use object storage, please rename `drive.config.secure` to `drive.config.useSSL` in config.
+
 5.0.0
 -----

--- a/README.md
+++ b/README.md
@ -43,9 +43,34 @@ If you want to...

 :heart: Backers & Sponsors
 ----------------------------------------------------------------
-| <img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/619786/32cf01444db24e578cd1982c197f6fc6/1?token-time=2145916800&token-hash=tB1e_r8RlZ5sFL0KV_e8dugapxatNBRK1Z3h67TO1g8%3D"> | <img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12378075/0156f769e20f412594fa6b87d85fe228/1?token-time=2145916800&token-hash=IsIJRUXszzoD6-7pDnRY8I05T9nSznc4GTaxj7C9SwU%3D"> | <img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/4503830/ccf2cc867ea64de0b524bb2e24b9a1cb/1?token-time=2145916800&token-hash=S1zP0QyLU52Dqq6dtc9qNYyWfW86XrYHiR4NMbeOrnA%3D"> | <img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1?token-time=2145916800&token-hash=tMosUojzUYJCH_3t--tvYA-SMCyrS__hzSndyaRSnbo%3D"> |
-|:-:|:-:|:-:|:-:|
-| [Gargron](https://www.patreon.com/mastodon) | [39ff](https://www.patreon.com/user/creators?u=12378075) | [dansup](https://www.patreon.com/dansup) | [Takashi Shibuya](https://www.patreon.com/user/creators?u=12531784) |
+<table>
+  <tr>
+    <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/619786/32cf01444db24e578cd1982c197f6fc6/1?token-time=2145916800&token-hash=tB1e_r8RlZ5sFL0KV_e8dugapxatNBRK1Z3h67TO1g8%3D"></td>
+    <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12378075/0156f769e20f412594fa6b87d85fe228/1?token-time=2145916800&token-hash=IsIJRUXszzoD6-7pDnRY8I05T9nSznc4GTaxj7C9SwU%3D"></td>
+    <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/4503830/ccf2cc867ea64de0b524bb2e24b9a1cb/1?token-time=2145916800&token-hash=S1zP0QyLU52Dqq6dtc9qNYyWfW86XrYHiR4NMbeOrnA%3D"></td>
+    <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1?token-time=2145916800&token-hash=tMosUojzUYJCH_3t--tvYA-SMCyrS__hzSndyaRSnbo%3D"></td>
+    <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12959468/c249e15aebec4424b5c0f427173671b6/1?token-time=2145916800&token-hash=lubpCEdxAkxPlpR2O6bvZ7BIh8Q4nGf-U_mE1qpjVAQ%3D"></td>
+    <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12913507/f7181eacafe8469a93033d85f5969c29/1?token-time=2145916800&token-hash=f03BFb4S2FUx9YEt87TnEmifb4h33OywGBW2akQVtQY%3D"></td>
+    <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/2?token-time=2145916800&token-hash=zElv7ZcPL3viGsXbNG_KWiKrbV0vvw1gk0panx8DJoo%3D"></td>
+    <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12731202/0995c46cdcb54153ab5f073f5869b70a/1?token-time=2145916800&token-hash=Yd60FK_SWfQO56SeiJpy1tDHOnCV4xdEywQe8gn5_Wo%3D"></td>
+    <td><img src="https://c8.patreon.com/2/100/12718187"></td>
+    <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12931605/ead494101f364dffa90efe49e36fb494/1?token-time=2145916800&token-hash=NzSFPjIlodXyv41rwK61aZWVZWfI4surJaNj8vWKvqM%3D"></td>
+    <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12021162/963128bb8d14476dbd8407943db8f31a/1?token-time=2145916800&token-hash=GgJ_NmUB6_nnRNLVGUWjV-WX91On7BOu59LKncYV9fE%3D"></td>
+  </tr>
+  <tr>
+    <td><a href="https://www.patreon.com/mastodon">Gargron</a></td>
+    <td><a href="https://www.patreon.com/user/creators?u=12378075">39ff</a></td>
+    <td><a href="https://www.patreon.com/dansup">dansup</a></td>
+    <td><a href="https://www.patreon.com/user/creators?u=12531784">Takashi Shibuya</a></td>
+    <td><a href="https://www.patreon.com/fujishan">fujishan</a></td>
+    <td><a href="https://www.patreon.com/user?u=12913507">Melilot</a></td>
+    <td><a href="https://www.patreon.com/user?u=5881381">Naoki Kosaka</a></td>
+    <td><a href="https://www.patreon.com/user?u=12731202">negao</a></td>
+    <td><a href="https://www.patreon.com/user?u=12718187">Peter G.</a></td>
+    <td><a href="https://www.patreon.com/user?u=12931605">Reiju</a></td>
+    <td><a href="https://www.patreon.com/gutfuckllc">gutfuckllc</a></td>
+  </tr>
+</table>

 :four_leaf_clover: Copyright
 ----------------------------------------------------------------
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@ -1,26 +0,0 @@
-FROM base/archlinux
-
-MAINTAINER Aya Morisawa
-
-RUN rm /etc/pacman.d/mirrorlist
-RUN echo 'Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch'    >> /etc/pacman.d/mirrorlist
-RUN echo 'Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist
-
-RUN rm /etc/localtime
-RUN ln -s /usr/share/zoneinfo/Asia/Tokyo /etc/localtime
-
-RUN pacman -Sy --noconfirm
-RUN pacman -S --noconfirm pacman
-RUN pacman-db-upgrade
-RUN pacman -S --noconfirm archlinux-keyring
-RUN pacman -Syyu --noconfirm
-RUN pacman -S --noconfirm git nodejs npm mongodb redis
-
-COPY misskey.sh /root/misskey.sh
-RUN chmod u+x /root/misskey.sh
-
-EXPOSE 80
-EXPOSE 443
-EXPOSE 27017
-
-CMD ["/root/misskey.sh"]
--- a/docker/misskey.sh
+++ b/docker/misskey.sh
@ -1,6 +0,0 @@
-#!/bin/sh
-redis-server --daemonize yes
-mongod > /dev/null &
-cd /root/misskey
-npm start
-tail -f /dev/null
--- a/docs/docker.en.md
+++ b/docs/docker.en.md
@ -1,29 +0,0 @@
-Setup with Docker :whale:
-================================================================
-
-Ensure that the working directory is the repository root directory.
-
-To create misskey image:
-``` console
-$ sudo docker build -t misskey ./docker
-```
-
-To run misskey:
-``` console
-$ sudo docker run --rm -i -t -p $PORT:80 -v $(pwd):/root/misskey -v $DBPATH:/data/db misskey
-```
-
-where `$PORT` is the port used to access Misskey Web from host browser
-and `$DBPATH` is the path of MongoDB database on the host for data persistence.
-
-ex:
-``` console
-$ sudo docker run --rm -i -t -p 80:80 -v $(pwd):/root/misskey -v /data/db:/data/db misskey
-```
-
-If you want to run misskey in production mode, add `--env NODE_ENV=production` like this:
-``` console
-$ sudo docker run --rm -i -t -p 80:80 -v $(pwd):/root/misskey -v /data/db:/data/db --env NODE_ENV=production misskey
-```
-
-Note that `$(pwd)` is the working directory.
--- a/docs/setup.en.md
+++ b/docs/setup.en.md
@ -62,6 +62,13 @@ npm install web-push -g
 web-push generate-vapid-keys
 ```

+*(optional)* Create a twitter application
+----------------------------------------------------------------
+If you want to enable the twitter integration, you need to create a twitter app at [https://developer.twitter.com/en/apply/user](https://developer.twitter.com/en/apply/user).
+
+In the app you need to set the oauth callback url as : https://misskey-instance/api/tw/cb
+
+
 *5.* Make configuration file
 ----------------------------------------------------------------
 1. `cp .config/example.yml .config/default.yml` Copy the `.config/example.yml` and rename it to `default.yml`.
--- a/locales/ca.yml
+++ b/locales/ca.yml
@ -66,6 +66,7 @@ common:
    congrats: "おめでとう"
    angry: "おこ"
    confused: "こまこまのこまり"
+    rip: "RIP"
    pudding: "Pudding"
  note-placeholders:
    a: "今どうしてる？"
@ -168,6 +169,9 @@ common/views/components/games/reversi/reversi.vue:
 common/views/components/games/reversi/reversi.game.vue:
  surrender: "投了"
  surrendered: "投了により"
+  is-llotheo: "石の少ない方が勝ち(ロセオ)"
+  looped-map: "ループマップ"
+  can-put-everywhere: "どこでも置けるモード"
 common/views/components/games/reversi/reversi.index.vue:
  title: "Misskey Reversi"
  sub-title: "他のMisskeyユーザーとリバーシで対戦しよう"
@ -780,6 +784,25 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"
+desktop/views/pages/admin/admin.vue:
+  dashboard: "ダッシュボード"
+  drive: "ドライブ"
+  users: "ユーザー"
+  update: "更新"
+desktop/views/pages/admin/admin.dashboard.vue:
+  dashboard: "ダッシュボード"
+  all-users: "全てのユーザー"
+  original-users: "このインスタンスのユーザー"
+  all-notes: "全てのノート"
+  original-notes: "このインスタンスのノート"
+desktop/views/pages/admin/admin.suspend-user.vue:
+  suspend-user: "ユーザーの凍結"
+  suspend: "凍結"
+  suspended: "凍結しました"
+desktop/views/pages/admin/admin.unsuspend-user.vue:
+  unsuspend-user: "ユーザーの凍結の解除"
+  unsuspend: "凍結の解除"
+  unsuspended: "凍結を解除しました"
 desktop/views/pages/deck/deck.tl-column.vue:
  is-media-only: "メディア投稿のみ"
  is-media-view: "メディアビュー"
--- a/locales/de.yml
+++ b/locales/de.yml
@ -66,6 +66,7 @@ common:
    congrats: "Glückwunsch!"
    angry: "Wütend"
    confused: "Verwirrt"
+    rip: "RIP"
    pudding: "Pudding"
  note-placeholders:
    a: "Was machst du gerade?"
@ -168,6 +169,9 @@ common/views/components/games/reversi/reversi.vue:
 common/views/components/games/reversi/reversi.game.vue:
  surrender: "投了"
  surrendered: "投了により"
+  is-llotheo: "石の少ない方が勝ち(ロセオ)"
+  looped-map: "ループマップ"
+  can-put-everywhere: "どこでも置けるモード"
 common/views/components/games/reversi/reversi.index.vue:
  title: "Misskey Reversi"
  sub-title: "他のMisskeyユーザーとリバーシで対戦しよう"
@ -780,6 +784,25 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"
+desktop/views/pages/admin/admin.vue:
+  dashboard: "ダッシュボード"
+  drive: "ドライブ"
+  users: "ユーザー"
+  update: "更新"
+desktop/views/pages/admin/admin.dashboard.vue:
+  dashboard: "ダッシュボード"
+  all-users: "全てのユーザー"
+  original-users: "このインスタンスのユーザー"
+  all-notes: "全てのノート"
+  original-notes: "このインスタンスのノート"
+desktop/views/pages/admin/admin.suspend-user.vue:
+  suspend-user: "ユーザーの凍結"
+  suspend: "凍結"
+  suspended: "凍結しました"
+desktop/views/pages/admin/admin.unsuspend-user.vue:
+  unsuspend-user: "ユーザーの凍結の解除"
+  unsuspend: "凍結の解除"
+  unsuspended: "凍結を解除しました"
 desktop/views/pages/deck/deck.tl-column.vue:
  is-media-only: "メディア投稿のみ"
  is-media-view: "メディアビュー"
--- a/locales/en.yml
+++ b/locales/en.yml
@ -8,17 +8,17 @@ common:
  about: "Thank you for finding Misskey. Misskey is a <b>decentralized microblogging platform</b> born on Earth. Since it exists within the 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?"
  adblock:
    detected: "Please disable ad blocker."
-    warning: "<strong>Misskey is not running ads</strong>, but some features may be unavailable or malfunctioning if ad blocking features are enabled."
-  application-authorization: "Application authorizations."
+    warning: "Some features may be unavailable or cause malfunctions if ad blocking features are enabled. <strong>Misskey is not running ads</strong>."
+  application-authorization: "Application authorizations"
  close: "Close"
-  do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
+  do-not-copy-paste: "Please do not enter or paste the code here. Account may be compromised."
  got-it: "Got it!"
  customization-tips:
    title: "Customization tips"
    paragraph1: "Home customization allows you to add/delete, drag and drop and rearrange widgets."
    paragraph2: "You can change the display by <strong>right clicking</strong> on some widgets."
-    paragraph3: "To delete a widget, <strong>drag and drop the widget onto the area labeled \"Trash\"</strong> in the header."
-    paragraph4: "To finish the customization, click \"Finish\" in the upper right."
+    paragraph3: "To delete a widget, drag and drop the widget onto <strong>the area labeled \"Trash\"</strong> in the header."
+    paragraph4: "To finish the customization, click \"Finish\" on the upper right."
    gotit: "Got it!"
  notification:
    file-uploaded: "File uploaded!"
@ -66,6 +66,7 @@ common:
    congrats: "Congrats!"
    angry: "Angry"
    confused: "Confused"
+    rip: "RIP"
    pudding: "Pudding"
  note-placeholders:
    a: "What are you doing?"
@ -83,7 +84,7 @@ common:
  my-token-regenerated: "Your token has been regenerated, so you will be signed out."
  i-like-sushi: "I prefer sushi rather than pudding"
  show-reversi-board-labels: "Show row and column labels in Reversi"
-  verified-user: "Verified user"
+  verified-user: "Authorized User"
  disable-animated-mfm: "Disable animated texts in a post"
  reversi:
    drawn: "Draw"
@ -150,7 +151,7 @@ auth/views/form.vue:
  notification-read: "Read your notifications."
  notification-write: "Manage your notifications."
  cancel: "Cancel"
-  accept: "Grant access."
+  accept: "Allow access."
 auth/views/index.vue:
  loading: "Loading"
  denied: "Application authorization denied."
@ -168,6 +169,9 @@ common/views/components/games/reversi/reversi.vue:
 common/views/components/games/reversi/reversi.game.vue:
  surrender: "Surrender"
  surrendered: "By surrender"
+  is-llotheo: "The lesser one wins"
+  looped-map: "Looped map"
+  can-put-everywhere: "Can put everywhere"
 common/views/components/games/reversi/reversi.index.vue:
  title: "Misskey Reversi"
  sub-title: "Play reversi with your friends!"
@ -175,13 +179,13 @@ common/views/components/games/reversi/reversi.index.vue:
  rule: "How to play"
  rule-desc: "Reversi is a strategy board game for two players, played on an 8×8 uncheckered board. There are sixty-four identical game pieces called disks (often spelled \"discs\"), which are light on one side and dark on the other. Players take turns placing disks on the board with their assigned color facing up. During a play, any disks of the opponent's color that are in a straight line and bounded by the disk just placed and another disk of the current player's color are turned over to the current player's color. The object of the game is to have the majority of disks turned to display your color when the last playable empty square is filled."
  mode-invite: "Invite"
-  mode-invite-desc: "Invite to the game a user."
-  invitations: "You received invitation!"
-  my-games: "My games"
+  mode-invite-desc: "Game with a specified user."
+  invitations: "You’ve got an invitation!"
+  my-games: "My game"
  all-games: "All games"
-  enter-username: "Enter username"
+  enter-username: "Enter a username"
  game-state:
-    ended: "Ended"
+    ended: "Finished"
    playing: "In Progress"
 common/views/components/games/reversi/reversi.room.vue:
  settings-of-the-game: "Game settings"
@ -190,14 +194,14 @@ common/views/components/games/reversi/reversi.room.vue:
  black-or-white: "Black/White"
  black-is: "Black is {}"
  rules: "Rules"
-  is-llotheo: "The lesser one wins"
+  is-llotheo: "The lesser side wins"
  looped-map: "Looped map"
  can-put-everywhere: "Can put everywhere"
  settings-of-the-bot: "Bot settings"
-  this-game-is-started-soon: "The game will begin soon"
-  waiting-for-other: "Waiting for the other party's preparation"
-  waiting-for-me: "Waiting for the your preparation"
-  waiting-for-both: "Waiting for yours"
+  this-game-is-started-soon: "The game will begin in seconds"
+  waiting-for-other: "Waiting for the opponent"
+  waiting-for-me: "Waiting for you"
+  waiting-for-both: "Prepareing"
  cancel: "Cancel"
  ready: "Ready"
  cancel-ready: "Cancel \"Ready\""
@ -235,13 +239,13 @@ common/views/components/messaging-room.vue:
  no-history: "There is no further history"
  resize-form: "Drag to resize"
  new-message: "New message"
-  only-one-file-attached: "メッセージに添付できるのはひとつのファイルのみです"
+  only-one-file-attached: "Only ONE file can be attached to a message."
 common/views/components/messaging-room.form.vue:
  input-message-here: "Enter message here"
  send: "Send"
  attach-from-local: "Attach files from your device"
  attach-from-drive: "Attach files from your Drive"
-  only-one-file-attached: "メッセージに添付できるのはひとつのファイルのみです"
+  only-one-file-attached: "Only one file can be attached to the message."
 common/views/components/messaging-room.message.vue:
  is-read: "Read"
  deleted: "This message has been deleted"
@ -256,9 +260,9 @@ common/views/components/nav.vue:
  feedback: "Feedback"
 common/views/components/note-menu.vue:
  favorite: "Favorite this note"
-  pin: "Pin to your profile page"
+  pin: "Pin to your profile"
  delete: "Delete"
-  delete-confirm: "Are you sure you want to delete this post?"
+  delete-confirm: "Delete this post?"
  remote: "Show original note"
 common/views/components/poll.vue:
  vote-to: "Vote for '{}'"
@ -268,9 +272,9 @@ common/views/components/poll.vue:
  show-result: "Show results"
  voted: "Voted"
 common/views/components/poll-editor.vue:
-  no-only-one-choice: "At least two choices are required for this survey."
+  no-only-one-choice: "At least two choices are required"
  choice-n: "Choice {}"
-  remove: "Delete this choice"
+  remove: "Delete the choice"
  add: "+ Add a choice"
  destroy: "Discard the poll"
 common/views/components/reaction-picker.vue:
@ -285,15 +289,15 @@ common/views/components/signin.vue:
  signin-with-twitter: "Log in with Twitter"
 common/views/components/signup.vue:
  username: "Username"
-  checking: "Checking..."
+  checking: "Confirming..."
  available: "Available"
  unavailable: "Unavailable"
  error: "Network error"
-  invalid-format: "Only use letters, numbers and -."
-  too-short: "Please enter at least 1 character!"
-  too-long: "Please enter up to 20 characters."
+  invalid-format: "letters, numbers and _ are acceptable."
+  too-short: "Should not be blank!"
+  too-long: "Enter within 20 characters."
  password: "Password"
-  password-placeholder: "We recommend more than 8 characters."
+  password-placeholder: "More than 8 characters are recommended."
  weak-password: "Weak password"
  normal-password: "Fair password"
  strong-password: "Strong password"
@ -323,9 +327,9 @@ common/views/components/uploader.vue:
 common/views/components/visibility-chooser.vue:
  public: "Public"
  home: "Home"
-  home-desc: "Post to the home timeline only"
+  home-desc: "Post to Home only"
  followers: "Followers"
-  followers-desc: "Post to followers only"
+  followers-desc: "Post to Followers only"
  specified: "Direct"
  specified-desc: "Post to specified users only"
  private: "Private"
@ -336,8 +340,8 @@ common/views/widgets/broadcast.vue:
  next: "Next"
 common/views/widgets/calendar.vue:
  year: "Year {}"
-  month: "Month {}"
-  day: "Day {}"
+  month: "{},"
+  day: "{}"
  today: "Today: "
  this-month: "This month: "
  this-year: "This year: "
@ -396,13 +400,13 @@ desktop:
  banner-crop-title: "Crop the part that appears as a banner"
  banner: "Banner"
  uploading-banner: "Uploading a new banner"
-  banner-updated: "Updated the banner"
+  banner-updated: "Successfully updated the banner"
  choose-banner: "Choose the banner"
  avatar-crop-title: "Crop the part that appears as an avatar"
  avatar: "Avatar"
  uploading-avatar: "Uploading a new avatar"
-  avatar-updated: "Updated the avatar"
-  choose-avatar: "Choose an avatar image"
+  avatar-updated: "Successfully updated the avatar"
+  choose-avatar: "Select an image for the avatar"
 desktop/views/components/activity.chart.vue:
  total: "Black ... Total"
  notes: "Blue ... Notes"
@ -450,7 +454,7 @@ desktop/views/components/drive.file.vue:
    rename-file: "Rename file"
    input-new-file-name: "Enter new name"
    copied: "Copied"
-    copied-url-to-clipboard: "Copied URL to clipboard"
+    copied-url-to-clipboard: "URL has been copied to clipboard"
 desktop/views/components/drive.folder.vue:
  unable-to-process: "The operation could not be completed."
  circular-reference-detected: "The destination folder is a subfolder of the folder you wish to move."
@ -484,7 +488,7 @@ desktop/views/components/drive.vue:
    upload: "Upload a file"
    url-upload: "Upload from a URL"
 desktop/views/components/media-image.vue:
-  sensitive: "The content is NSFW"
+  sensitive: "NSFW"
  click-to-show: "Click to show"
 desktop/views/components/media-video.vue:
  sensitive: "The content is NSFW"
@ -523,8 +527,8 @@ desktop/views/components/messaging-window.vue:
  title: "Messaging"
 desktop/views/components/note-detail.vue:
  more: "Load more conversations"
-  private: "This post is private"
-  deleted: "This post has been removed"
+  private: "Post is private"
+  deleted: "Post has been removed"
  reposted-by: "Reposted by {}"
  location: "Location"
  renote: "Repost"
@ -535,8 +539,8 @@ desktop/views/components/notes.note.vue:
  renote: "Repost"
  add-reaction: "Add a reaction"
  detail: "Show details"
-  private: "This post is private"
-  deleted: "The post has been deleted"
+  private: "Post is private"
+  deleted: "Post has been deleted"
  hide: "Hide"
  see-more: "See more"
 desktop/views/components/notes.vue:
@ -550,15 +554,15 @@ desktop/views/components/post-form.vue:
  add-visible-user: "+Add a user"
  attach-location-information: "Attach location information"
  hide-contents: "Hide contents"
-  reply-placeholder: "Reply to this note..."
-  quote-placeholder: "Quote this note..."
+  reply-placeholder: "Reply to this Post..."
+  quote-placeholder: "Quote this Post..."
  submit: "Post"
  reply: "Reply"
  renote: "Repost"
  posted: "Posted!"
  replied: "Replied!"
  reposted: "Reposted!"
-  note-failed: "Failed to post the note"
+  note-failed: "Failed to post"
  reply-failed: "Failed to reply"
  renote-failed: "Failed to repost"
  posting: "Posting"
@ -571,12 +575,12 @@ desktop/views/components/post-form.vue:
  recent-tags: "Recent"
  click-to-tagging: "Click to tagging"
  visibility: "Visibility"
-  geolocation-alert: "Your device does not support geolocalization."
+  geolocation-alert: "Your device can not measure location infomation"
  error: "Error"
  enter-username: "Please enter a username..."
-  annotations: "内容への注釈 (オプション)"
+  annotations: "Annotations for the post (optional)"
 desktop/views/components/post-form-window.vue:
-  note: "New note"
+  note: "New Post"
  reply: "Reply"
  attaches: "{} media attached"
  uploading-media: "Uploading {} media"
@ -588,9 +592,9 @@ desktop/views/components/renote-form.vue:
  renote: "Repost"
  reposting: "Reposting..."
  success: "Reposted!"
-  failure: "Repost failed"
+  failure: "Failed to Repost"
 desktop/views/components/renote-form-window.vue:
-  title: "Are you sure you want to repost this?"
+  title: "Do you want to Repost it?"
 desktop/views/components/settings-window.vue:
  settings: "Settings"
 desktop/views/components/settings.vue:
@ -685,11 +689,11 @@ desktop/views/components/settings.2fa.vue:
  submit: "Submit"
  success: "Settings saved!"
  failed: "Failed to setup. Please ensure that the token is correct."
-  info: "From now on, enter the token that is displayed on your device in addition to your password when signing-in to Misskey."
+  info: "From the next time you sign in to Misskey, the token displayed on your device will be necessary too, as well as the password."
 desktop/views/components/settings.api.vue:
  intro: "To access the API, set this token as the key 'i' of request parameters."
-  caution: "Please do not show this token to third parties (do not enter it somewhere else other than here) otherwise your account could get compromised."
-  regeneration-of-token: "In the unlikely event that this token leaks out, you can regenerate it."
+  caution: "Do not enter this token to any apps nor tell this token to others otherwise your account may get compromised."
+  regeneration-of-token: "In case this token (may) leaks out, you want to regenerate it so that you’ll be safe."
  regenerate-token: "Regenerate the token"
  token: "Token:"
  enter-password: "Please enter the password"
@ -709,18 +713,18 @@ desktop/views/components/settings.password.vue:
  changed: "Password updated"
 desktop/views/components/settings.profile.vue:
  avatar: "Avatar"
-  choice-avatar: "Choose an image"
+  choice-avatar: "Select an image"
  name: "Name"
  location: "Location"
  description: "Description"
  birthday: "Birthday"
  save: "Update profile"
  locked-account: "Protect your account"
-  is-locked: "Make a note private"
+  is-locked: "Make your posts private"
  other: "Other"
  is-bot: "This account is a Bot"
  is-cat: "This account is a Cat"
-  profile-updated: "Profile updated"
+  profile-updated: "Profile has successfully updated"
 desktop/views/components/sub-note-content.vue:
  private: "This post is private"
  deleted: "This post has been deleted"
@ -736,7 +740,7 @@ desktop/views/components/timeline.vue:
  list: "Lists"
 desktop/views/components/ui.header.vue:
  welcome-back: "Welcome back,"
-  adjective: "さん"
+  adjective: "Sir "
 desktop/views/components/ui.header.account.vue:
  profile: "Your profile"
  drive: "Media storage"
@ -780,6 +784,25 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "Pop-out"
  close: "Close"
+desktop/views/pages/admin/admin.vue:
+  dashboard: "Dashboard"
+  drive: "Drive"
+  users: "Users"
+  update: "Updates"
+desktop/views/pages/admin/admin.dashboard.vue:
+  dashboard: "Dashboard"
+  all-users: "All Users"
+  original-users: "Users on this instance"
+  all-notes: "All Posts"
+  original-notes: "Posts on this instance"
+desktop/views/pages/admin/admin.suspend-user.vue:
+  suspend-user: "Suspend a user"
+  suspend: "Suspend"
+  suspended: "Successfully suspended."
+desktop/views/pages/admin/admin.unsuspend-user.vue:
+  unsuspend-user: "Unsuspend users"
+  unsuspend: "Unsuspend"
+  unsuspended: "The user has successfully unsuspended."
 desktop/views/pages/deck/deck.tl-column.vue:
  is-media-only: "Only media posts"
  is-media-view: "Media view"
@ -793,7 +816,7 @@ desktop/views/pages/welcome.vue:
  gotit: "Got it!"
  signin: "Log In"
  signup: "Sign up"
-  signin-button: "Log in"
+  signin-button: "Logging in..."
  signup-button: "Sign up"
  timeline: "Timeline"
  powered-by-misskey: "Powered by <b>Misskey</b>."
@ -804,8 +827,8 @@ desktop/views/pages/favorites.vue:
 desktop/views/pages/home-customize.vue:
  title: "Customize home layout"
 desktop/views/pages/note.vue:
-  prev: "Previous note"
-  next: "Next note"
+  prev: "Previous post"
+  next: "Next post"
 desktop/views/pages/selectdrive.vue:
  title: "Choose file(s)"
  ok: "OK"
@ -817,22 +840,22 @@ desktop/views/pages/search.vue:
 desktop/views/pages/share.vue:
  share-with: "Share with {}."
 desktop/views/pages/tag.vue:
-  no-posts-found: "No posts \"{}\" found."
+  no-posts-found: "No posts contains \"{}\" found."
 desktop/views/pages/user-list.users.vue:
  users: "User"
  add-user: "Add a user"
  username: "Username"
 desktop/views/pages/user/user.followers-you-know.vue:
-  title: "Followers you know"
+  title: "Followers you may know"
  loading: "Loading"
  no-users: "No followers you know"
 desktop/views/pages/user/user.friends.vue:
  title: "Frequent mentions"
  loading: "Loading"
-  no-users: "No users"
+  no-users: "No frequent mentions"
 desktop/views/pages/user/user.vue:
  is-suspended: "This account has been suspended."
-  is-remote: "This user is a remote user, so the information about them that you see here is not complete. "
+  is-remote: "The user is a remote user. Information about them that you see here may not complete."
  view-remote: "See their complete profile"
 desktop/views/pages/user/user.home.vue:
  last-used-at: "Last active:"
@ -849,7 +872,7 @@ desktop/views/pages/user/user.profile.vue:
  muted: "Muting"
  unmute: "Unmute"
  push-to-a-list: "Add to list"
-  list-pushed: "You added {user} to {list}."
+  list-pushed: "Successfully added {user} to {list}."
 desktop/views/pages/user/user.header.vue:
  posts: "Notes"
  following: "Following"
@ -857,18 +880,18 @@ desktop/views/pages/user/user.header.vue:
  is-bot: "This account is a Bot"
 desktop/views/pages/user/user.timeline.vue:
  default: "Posts"
-  with-replies: "Notes and replies"
+  with-replies: "Posts and replies"
  with-media: "Media"
  empty: "This user doesn't seem to have posted anything yet."
 desktop/views/widgets/messaging.vue:
-  title: "Messaging"
+  title: "Message"
 desktop/views/widgets/notifications.vue:
  title: "Notifications"
  settings: "Settings"
 desktop/views/widgets/polls.vue:
  title: "Polls"
  refresh: "refresh"
-  nothing: "Nothing"
+  nothing: "No polls found!"
 desktop/views/widgets/post-form.vue:
  title: "Post"
  note: "Post"
@ -878,11 +901,11 @@ desktop/views/widgets/profile.vue:
 desktop/views/widgets/trends.vue:
  title: "Trend"
  refresh: "refresh"
-  nothing: "Nothing"
+  nothing: "No trends found!"
 desktop/views/widgets/users.vue:
  title: "Recommended users"
  refresh: "refresh"
-  no-one: "No one"
+  no-one: "Anyone!"
 mobile/views/components/drive.vue:
  drive: "Media storage"
  used: "used"
@ -912,7 +935,7 @@ mobile/views/components/drive.file-detail.vue:
  hash: "Hash (md5)"
  exif: "EXIF"
 mobile/views/components/media-image.vue:
-  sensitive: "The content is NSFW"
+  sensitive: "NSFW"
  click-to-show: "Click to show"
 mobile/views/components/media-video.vue:
  sensitive: "The content is NSFW"
@ -923,7 +946,7 @@ mobile/views/components/follow-button.vue:
  request-pending: "Pending follow request"
  follow-request: "Follow request"
 mobile/views/components/friends-maker.vue:
-  title: "Let's follow users"
+  title: "Let's follow them"
  empty: "Featured user was not found."
  fetching: "Loading"
  refresh: "See more"
@ -954,7 +977,7 @@ mobile/views/components/notes.vue:
  failed: "Failed to load"
  retry: "Retry"
 mobile/views/components/notifications.vue:
-  more: "More"
+  more: "See more"
  empty: "No notifications"
 mobile/views/components/post-form.vue:
  add-visible-user: "Add a user"
@ -963,7 +986,7 @@ mobile/views/components/post-form.vue:
  renote: "Renote"
  quote-placeholder: "Quote this post... (optional)"
  reply-placeholder: "Reply to this note..."
-  cw-placeholder: "Comments about content (optional)"
+  cw-placeholder: "Comments for the post (optional)"
  location-alert: "Your device does not provide location services"
  error: "Error"
  username-prompt: "Enter user name"
@ -977,7 +1000,7 @@ mobile/views/components/timeline.vue:
  load-more: "More"
 mobile/views/components/ui.header.vue:
  welcome-back: "Welcome back, "
-  adjective: "さん"
+  adjective: "Sir"
 mobile/views/components/ui.nav.vue:
  timeline: "Timeline"
  notifications: "Notifications"
@ -994,7 +1017,7 @@ mobile/views/components/ui.nav.vue:
  about: "About Misskey"
 mobile/views/components/user-timeline.vue:
  no-notes: "It seems this user hasn't posted anything yet."
-  no-notes-with-media: "There are no notes with media attachments"
+  no-notes-with-media: "There are no posts attaching media"
  load-more: "More"
 mobile/views/components/users-list.vue:
  all: "All"
@ -1009,7 +1032,7 @@ mobile/views/pages/drive.vue:
  drive: "Drive"
  more: "Load more"
 mobile/views/pages/signup.vue:
-  lets-start: "Let's start! 📦"
+  lets-start: "Your account is now ready! 📦"
 mobile/views/pages/followers.vue:
  followers-of: "Followers of {}"
 mobile/views/pages/following.vue:
@ -1066,7 +1089,7 @@ mobile/views/pages/settings/settings.profile.vue:
 mobile/views/pages/search.vue:
  search: "Search"
  empty: "No posts were found for '{}'"
-  not-found: "「{}」に関する投稿は見つかりませんでした。"
+  not-found: "No posts were found for \"{}\"."
 mobile/views/pages/selectdrive.vue:
  select-file: "Choose files"
 mobile/views/pages/settings.vue:
@ -1078,7 +1101,7 @@ mobile/views/pages/settings.vue:
  specify-language: "Select your language"
  design: "Design and display"
  dark-mode: "Dark Mode"
-  i-am-under-limited-internet: "I'm under limited internet"
+  i-am-under-limited-internet: "I'm in limited bandwidth"
  circle-icons: "Use circle icons"
  timeline: "Timeline"
  show-reply-target: "Show reply target"
@ -1090,7 +1113,7 @@ mobile/views/pages/settings.vue:
  behavior: "Behavior"
  fetch-on-scroll: "Endless loading on scroll"
  disable-via-mobile: "Don't mark the post as 'from mobile'"
-  load-raw-images: "Show attached images in high-quality"
+  load-raw-images: "Show attached images in original quality"
  load-remote-media: "Show media from a remote server"
  twitter: "Twitter integration"
  twitter-connect: "Connect to your Twitter account"
@ -1111,7 +1134,7 @@ mobile/views/pages/user.vue:
  follows-you: "Follows you"
  following: "Following"
  followers: "Followers"
-  notes: "Notes"
+  notes: "Posts"
  overview: "Overview"
  timeline: "Timeline"
  media: "Media"
--- a/locales/es.yml
+++ b/locales/es.yml
@ -66,6 +66,7 @@ common:
    congrats: "felicidades"
    angry: "enfadado"
    confused: "confundido"
+    rip: "RIP"
    pudding: "Chafado"
  note-placeholders:
    a: "¿Qué haces?"
@ -168,6 +169,9 @@ common/views/components/games/reversi/reversi.vue:
 common/views/components/games/reversi/reversi.game.vue:
  surrender: "Rendirse"
  surrendered: "Por rendirse"
+  is-llotheo: "石の少ない方が勝ち(ロセオ)"
+  looped-map: "ループマップ"
+  can-put-everywhere: "どこでも置けるモード"
 common/views/components/games/reversi/reversi.index.vue:
  title: "Misskey Reversi"
  sub-title: "¡Juega Reversi con tus amigos!"
@ -780,6 +784,25 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"
+desktop/views/pages/admin/admin.vue:
+  dashboard: "ダッシュボード"
+  drive: "ドライブ"
+  users: "ユーザー"
+  update: "更新"
+desktop/views/pages/admin/admin.dashboard.vue:
+  dashboard: "ダッシュボード"
+  all-users: "全てのユーザー"
+  original-users: "このインスタンスのユーザー"
+  all-notes: "全てのノート"
+  original-notes: "このインスタンスのノート"
+desktop/views/pages/admin/admin.suspend-user.vue:
+  suspend-user: "ユーザーの凍結"
+  suspend: "凍結"
+  suspended: "凍結しました"
+desktop/views/pages/admin/admin.unsuspend-user.vue:
+  unsuspend-user: "ユーザーの凍結の解除"
+  unsuspend: "凍結の解除"
+  unsuspended: "凍結を解除しました"
 desktop/views/pages/deck/deck.tl-column.vue:
  is-media-only: "メディア投稿のみ"
  is-media-view: "メディアビュー"
--- a/locales/fr.yml
+++ b/locales/fr.yml
@ -11,7 +11,7 @@ common:
    warning: "<strong>Misskey n'utilise pas de publicités</strong>, mais quelques options peuvent être non disponibles ou fonctionneraient mal si un bloqueur de publicités est activé."
  application-authorization: "Permissions de l'application"
  close: "Fermer"
-  do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
+  do-not-copy-paste: "Veuillez ne pas entrer ou coller le code ici. Le compte peut être compromis."
  got-it: "J'ai compris !"
  customization-tips:
    title: "Conseils de personnalisation"
@ -66,6 +66,7 @@ common:
    congrats: "Félicitations !"
    angry: "En colère"
    confused: "Confus"
+    rip: "RIP"
    pudding: "Pudding"
  note-placeholders:
    a: "Que faîtes vous maintenant ?"
@ -168,6 +169,9 @@ common/views/components/games/reversi/reversi.vue:
 common/views/components/games/reversi/reversi.game.vue:
  surrender: "Se rendre"
  surrendered: "Par abandon"
+  is-llotheo: "石の少ない方が勝ち(ロセオ)"
+  looped-map: "Carte en boucle"
+  can-put-everywhere: "どこでも置けるモード"
 common/views/components/games/reversi/reversi.index.vue:
  title: "Misskey Reversi"
  sub-title: "Jouer à Reversi avec vos amis·es !"
@ -780,6 +784,25 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "Fermer"
+desktop/views/pages/admin/admin.vue:
+  dashboard: "ダッシュボード"
+  drive: "ドライブ"
+  users: "ユーザー"
+  update: "更新"
+desktop/views/pages/admin/admin.dashboard.vue:
+  dashboard: "ダッシュボード"
+  all-users: "全てのユーザー"
+  original-users: "このインスタンスのユーザー"
+  all-notes: "全てのノート"
+  original-notes: "このインスタンスのノート"
+desktop/views/pages/admin/admin.suspend-user.vue:
+  suspend-user: "ユーザーの凍結"
+  suspend: "凍結"
+  suspended: "凍結しました"
+desktop/views/pages/admin/admin.unsuspend-user.vue:
+  unsuspend-user: "ユーザーの凍結の解除"
+  unsuspend: "凍結の解除"
+  unsuspended: "凍結を解除しました"
 desktop/views/pages/deck/deck.tl-column.vue:
  is-media-only: "Les publications médias uniquement"
  is-media-view: "Vue média"
@ -817,7 +840,7 @@ desktop/views/pages/search.vue:
 desktop/views/pages/share.vue:
  share-with: "Partager avec {}"
 desktop/views/pages/tag.vue:
-  no-posts-found: "ハッシュタグ「{}」が付けられた投稿は見つかりませんでした。"
+  no-posts-found: "Pas de message avec un hashtag {} trouvé."
 desktop/views/pages/user-list.users.vue:
  users: "Utilisateurs"
  add-user: "Ajouter un utilisateur"
@ -842,7 +865,7 @@ desktop/views/pages/user/user.photos.vue:
  no-photos: "Pas de photos"
 desktop/views/pages/user/user.profile.vue:
  follows-you: "Vous suis"
-  stalk: "ストークする"
+  stalk: "Traquer"
  stalking: "ストーキングしています"
  unstalk: "ストーク解除"
  mute: "Mettre en sourdine"
@ -892,11 +915,11 @@ mobile/views/components/drive.vue:
  load-more: "Charger plus"
  nothing-in-drive: "Rien"
  folder-is-empty: "Ce dossier est vide"
-  prompt: "何をしますか？(数字を入力してください): <1 → ファイルをアップロード | 2 → ファイルをURLでアップロード | 3 → フォルダ作成 | 4 → このフォルダ名を変更 | 5 → このフォルダを移動 | 6 → このフォルダを削除>"
+  prompt: "Que veux-tu faire ? (Entrez un nombre): <1 → Télécharger le fichier | 2 → Télécharger le fichier avec l'URL | 3 → Créer le dossier | 4 → Modifier le nom du dossier | 5 → Déplacer ce dossier | 6 → Supprimer ce dossier >"
  deletion-alert: "Désolé ! La suppression d’un dossier n’est pas encore implémentée."
  folder-name: "Nom du dossier"
-  root-rename-alert: "現在いる場所はルートで、フォルダではないため名前の変更はできません。名前を変更したいフォルダに移動してからやってください。"
-  root-move-alert: "現在いる場所はルートで、フォルダではないため移動はできません。移動したいフォルダに移動してからやってください。"
+  root-rename-alert: "L'emplacement actuel est la racine, pas le dossier, vous ne pouvez donc pas le renommer. Veuillez vous déplacer dans le dossier dont vous souhaitez modifier le nom."
+  root-move-alert: "L'emplacement actuel est la racine, ce n'est pas un dossier et il ne peut pas être déplacé. Veuillez vous déplacer dans le dossier que vous souhaitez déplacer."
  url-prompt: "URL du fichier que vous souhaitez téléverser"
  uploading: "アップロードをリクエストしました。アップロードが完了するまで時間がかかる場合があります。"
 mobile/views/components/drive-file-detail.vue:
@ -976,7 +999,7 @@ mobile/views/components/timeline.vue:
  empty: "Pas de notes"
  load-more: "Afficher plus"
 mobile/views/components/ui.header.vue:
-  welcome-back: "Bon retour parmi nous !"
+  welcome-back: "Content de vous revoir ! "
  adjective: "さん"
 mobile/views/components/ui.nav.vue:
  timeline: "Fil d'actualité"
@ -1020,7 +1043,7 @@ mobile/views/pages/home.vue:
  hybrid: "Social"
  global: "Global"
 mobile/views/pages/tag.vue:
-  no-posts-found: "ハッシュタグ「{}」が付けられた投稿は見つかりませんでした。"
+  no-posts-found: "Pas de message avec un hashtag {} trouvé."
 mobile/views/pages/welcome.vue:
  signup: "S'enregistrer"
 mobile/views/pages/widgets.vue:
@ -1066,7 +1089,7 @@ mobile/views/pages/settings/settings.profile.vue:
 mobile/views/pages/search.vue:
  search: "Chercher"
  empty: "Aucun message trouvé pour '{}' "
-  not-found: "「{}」に関する投稿は見つかりませんでした。"
+  not-found: "Aucun post pour {} n'a été trouvé."
 mobile/views/pages/selectdrive.vue:
  select-file: "Choisissez un fichier"
 mobile/views/pages/settings.vue:
--- a/locales/it.yml
+++ b/locales/it.yml
@ -66,6 +66,7 @@ common:
    congrats: "おめでとう"
    angry: "おこ"
    confused: "こまこまのこまり"
+    rip: "RIP"
    pudding: "Pudding"
  note-placeholders:
    a: "今どうしてる？"
@ -168,6 +169,9 @@ common/views/components/games/reversi/reversi.vue:
 common/views/components/games/reversi/reversi.game.vue:
  surrender: "投了"
  surrendered: "投了により"
+  is-llotheo: "石の少ない方が勝ち(ロセオ)"
+  looped-map: "ループマップ"
+  can-put-everywhere: "どこでも置けるモード"
 common/views/components/games/reversi/reversi.index.vue:
  title: "Misskey Reversi"
  sub-title: "他のMisskeyユーザーとリバーシで対戦しよう"
@ -780,6 +784,25 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"
+desktop/views/pages/admin/admin.vue:
+  dashboard: "ダッシュボード"
+  drive: "ドライブ"
+  users: "ユーザー"
+  update: "更新"
+desktop/views/pages/admin/admin.dashboard.vue:
+  dashboard: "ダッシュボード"
+  all-users: "全てのユーザー"
+  original-users: "このインスタンスのユーザー"
+  all-notes: "全てのノート"
+  original-notes: "このインスタンスのノート"
+desktop/views/pages/admin/admin.suspend-user.vue:
+  suspend-user: "ユーザーの凍結"
+  suspend: "凍結"
+  suspended: "凍結しました"
+desktop/views/pages/admin/admin.unsuspend-user.vue:
+  unsuspend-user: "ユーザーの凍結の解除"
+  unsuspend: "凍結の解除"
+  unsuspended: "凍結を解除しました"
 desktop/views/pages/deck/deck.tl-column.vue:
  is-media-only: "メディア投稿のみ"
  is-media-view: "メディアビュー"
--- a/locales/ja.yml
+++ b/locales/ja.yml
@ -70,6 +70,7 @@ common:
    congrats: "おめでとう"
    angry: "おこ"
    confused: "こまこまのこまり"
+    rip: "RIP"
    pudding: "Pudding"

  note-placeholders:
@ -181,6 +182,9 @@ common/views/components/games/reversi/reversi.vue:
 common/views/components/games/reversi/reversi.game.vue:
  surrender: "投了"
  surrendered: "投了により"
+  is-llotheo: "石の少ない方が勝ち(ロセオ)"
+  looped-map: "ループマップ"
+  can-put-everywhere: "どこでも置けるモード"

 common/views/components/games/reversi/reversi.index.vue:
  title: "Misskey Reversi"
@ -893,6 +897,29 @@ desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"

+desktop/views/pages/admin/admin.vue:
+  dashboard: "ダッシュボード"
+  drive: "ドライブ"
+  users: "ユーザー"
+  update: "更新"
+
+desktop/views/pages/admin/admin.dashboard.vue:
+  dashboard: "ダッシュボード"
+  all-users: "全てのユーザー"
+  original-users: "このインスタンスのユーザー"
+  all-notes: "全てのノート"
+  original-notes: "このインスタンスのノート"
+
+desktop/views/pages/admin/admin.suspend-user.vue:
+  suspend-user: "ユーザーの凍結"
+  suspend: "凍結"
+  suspended: "凍結しました"
+
+desktop/views/pages/admin/admin.unsuspend-user.vue:
+  unsuspend-user: "ユーザーの凍結の解除"
+  unsuspend: "凍結の解除"
+  unsuspended: "凍結を解除しました"
+
 desktop/views/pages/deck/deck.tl-column.vue:
  is-media-only: "メディア投稿のみ"
  is-media-view: "メディアビュー"
--- a/locales/ko.yml
+++ b/locales/ko.yml
@ -66,6 +66,7 @@ common:
    congrats: "받으세요"
    angry: "화냈어"
    confused: "곤란하고 있어"
+    rip: "RIP"
    pudding: "Pudding"
  note-placeholders:
    a: "지금 어떻게하고있어?"
@ -168,6 +169,9 @@ common/views/components/games/reversi/reversi.vue:
 common/views/components/games/reversi/reversi.game.vue:
  surrender: "投了"
  surrendered: "投了により"
+  is-llotheo: "石の少ない方が勝ち(ロセオ)"
+  looped-map: "ループマップ"
+  can-put-everywhere: "どこでも置けるモード"
 common/views/components/games/reversi/reversi.index.vue:
  title: "Misskey Reversi"
  sub-title: "他のMisskeyユーザーとリバーシで対戦しよう"
@ -780,6 +784,25 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"
+desktop/views/pages/admin/admin.vue:
+  dashboard: "ダッシュボード"
+  drive: "ドライブ"
+  users: "ユーザー"
+  update: "更新"
+desktop/views/pages/admin/admin.dashboard.vue:
+  dashboard: "ダッシュボード"
+  all-users: "全てのユーザー"
+  original-users: "このインスタンスのユーザー"
+  all-notes: "全てのノート"
+  original-notes: "このインスタンスのノート"
+desktop/views/pages/admin/admin.suspend-user.vue:
+  suspend-user: "ユーザーの凍結"
+  suspend: "凍結"
+  suspended: "凍結しました"
+desktop/views/pages/admin/admin.unsuspend-user.vue:
+  unsuspend-user: "ユーザーの凍結の解除"
+  unsuspend: "凍結の解除"
+  unsuspended: "凍結を解除しました"
 desktop/views/pages/deck/deck.tl-column.vue:
  is-media-only: "メディア投稿のみ"
  is-media-view: "メディアビュー"
--- a/locales/pl.yml
+++ b/locales/pl.yml
@ -39,7 +39,7 @@ common:
    weeks_ago: "{} tyg. temu"
    months_ago: "{} mies. temu"
    years_ago: "{} lat temu"
-  month-and-day: "{month}月 {day}日"
+  month-and-day: "{month}-{day}"
  trash: "Kosz"
  weekday-short:
    sunday: "N"
@ -66,6 +66,7 @@ common:
    congrats: "Gratuluję!"
    angry: "Wściekły"
    confused: "Zmieszany"
+    rip: "RIP"
    pudding: "Pudding"
  note-placeholders:
    a: "Co robisz?"
@ -168,6 +169,9 @@ common/views/components/games/reversi/reversi.vue:
 common/views/components/games/reversi/reversi.game.vue:
  surrender: "投了"
  surrendered: "投了により"
+  is-llotheo: "石の少ない方が勝ち(ロセオ)"
+  looped-map: "ループマップ"
+  can-put-everywhere: "どこでも置けるモード"
 common/views/components/games/reversi/reversi.index.vue:
  title: "Misskey Reversi"
  sub-title: "Zagraj w Reversi ze znajomymi!"
@ -394,15 +398,15 @@ common/views/pages/follow.vue:
  follow-request: "Poproś o śledzenie"
 desktop:
  banner-crop-title: "バナーとして表示する部分を選択"
-  banner: "バナー"
-  uploading-banner: "新しいバナーをアップロードしています"
-  banner-updated: "バナーを更新しました"
-  choose-banner: "バナーにする画像を選択"
-  avatar-crop-title: "アバターとして表示する部分を選択"
-  avatar: "アバター"
-  uploading-avatar: "新しいアバターをアップロードしています"
-  avatar-updated: "アバターを更新しました"
-  choose-avatar: "アバターにする画像を選択"
+  banner: "Baner"
+  uploading-banner: "Wysyłanie baneru"
+  banner-updated: "Zmieniono baner"
+  choose-banner: "Wybierz baner"
+  avatar-crop-title: "Wybierz część obrazu, która zostanie użyta jako awatar"
+  avatar: "Awatar"
+  uploading-avatar: "Wysyłanie awatara"
+  avatar-updated: "Wysłano awatar"
+  choose-avatar: "Wybierz awatar"
 desktop/views/components/activity.chart.vue:
  total: "Czarny … Łącznie"
  notes: "Niebieski … Wpisy"
@ -780,6 +784,25 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "Pop-out"
  close: "Zamknij"
+desktop/views/pages/admin/admin.vue:
+  dashboard: "ダッシュボード"
+  drive: "ドライブ"
+  users: "ユーザー"
+  update: "更新"
+desktop/views/pages/admin/admin.dashboard.vue:
+  dashboard: "ダッシュボード"
+  all-users: "全てのユーザー"
+  original-users: "このインスタンスのユーザー"
+  all-notes: "全てのノート"
+  original-notes: "このインスタンスのノート"
+desktop/views/pages/admin/admin.suspend-user.vue:
+  suspend-user: "ユーザーの凍結"
+  suspend: "凍結"
+  suspended: "凍結しました"
+desktop/views/pages/admin/admin.unsuspend-user.vue:
+  unsuspend-user: "ユーザーの凍結の解除"
+  unsuspend: "凍結の解除"
+  unsuspended: "凍結を解除しました"
 desktop/views/pages/deck/deck.tl-column.vue:
  is-media-only: "Tylko wpisy z zawartością multimedialną"
  is-media-view: "Widok multimediów"
@ -1162,4 +1185,4 @@ docs:
      type: "Rodzaj"
      description: "Opis"
 dev/views/index.vue:
-  manage-apps: "アプリの管理"
+  manage-apps: "Zarządzaj aplikacjami"
--- a/locales/pt.yml
+++ b/locales/pt.yml
@ -66,6 +66,7 @@ common:
    congrats: "おめでとう"
    angry: "おこ"
    confused: "こまこまのこまり"
+    rip: "RIP"
    pudding: "Pudding"
  note-placeholders:
    a: "今どうしてる？"
@ -168,6 +169,9 @@ common/views/components/games/reversi/reversi.vue:
 common/views/components/games/reversi/reversi.game.vue:
  surrender: "投了"
  surrendered: "投了により"
+  is-llotheo: "石の少ない方が勝ち(ロセオ)"
+  looped-map: "ループマップ"
+  can-put-everywhere: "どこでも置けるモード"
 common/views/components/games/reversi/reversi.index.vue:
  title: "Misskey Reversi"
  sub-title: "他のMisskeyユーザーとリバーシで対戦しよう"
@ -780,6 +784,25 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"
+desktop/views/pages/admin/admin.vue:
+  dashboard: "ダッシュボード"
+  drive: "ドライブ"
+  users: "ユーザー"
+  update: "更新"
+desktop/views/pages/admin/admin.dashboard.vue:
+  dashboard: "ダッシュボード"
+  all-users: "全てのユーザー"
+  original-users: "このインスタンスのユーザー"
+  all-notes: "全てのノート"
+  original-notes: "このインスタンスのノート"
+desktop/views/pages/admin/admin.suspend-user.vue:
+  suspend-user: "ユーザーの凍結"
+  suspend: "凍結"
+  suspended: "凍結しました"
+desktop/views/pages/admin/admin.unsuspend-user.vue:
+  unsuspend-user: "ユーザーの凍結の解除"
+  unsuspend: "凍結の解除"
+  unsuspended: "凍結を解除しました"
 desktop/views/pages/deck/deck.tl-column.vue:
  is-media-only: "メディア投稿のみ"
  is-media-view: "メディアビュー"
--- a/locales/ru.yml
+++ b/locales/ru.yml
@ -66,6 +66,7 @@ common:
    congrats: "おめでとう"
    angry: "おこ"
    confused: "こまこまのこまり"
+    rip: "RIP"
    pudding: "Pudding"
  note-placeholders:
    a: "今どうしてる？"
@ -168,6 +169,9 @@ common/views/components/games/reversi/reversi.vue:
 common/views/components/games/reversi/reversi.game.vue:
  surrender: "投了"
  surrendered: "投了により"
+  is-llotheo: "石の少ない方が勝ち(ロセオ)"
+  looped-map: "ループマップ"
+  can-put-everywhere: "どこでも置けるモード"
 common/views/components/games/reversi/reversi.index.vue:
  title: "Misskey Reversi"
  sub-title: "他のMisskeyユーザーとリバーシで対戦しよう"
@ -780,6 +784,25 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"
+desktop/views/pages/admin/admin.vue:
+  dashboard: "ダッシュボード"
+  drive: "ドライブ"
+  users: "ユーザー"
+  update: "更新"
+desktop/views/pages/admin/admin.dashboard.vue:
+  dashboard: "ダッシュボード"
+  all-users: "全てのユーザー"
+  original-users: "このインスタンスのユーザー"
+  all-notes: "全てのノート"
+  original-notes: "このインスタンスのノート"
+desktop/views/pages/admin/admin.suspend-user.vue:
+  suspend-user: "ユーザーの凍結"
+  suspend: "凍結"
+  suspended: "凍結しました"
+desktop/views/pages/admin/admin.unsuspend-user.vue:
+  unsuspend-user: "ユーザーの凍結の解除"
+  unsuspend: "凍結の解除"
+  unsuspended: "凍結を解除しました"
 desktop/views/pages/deck/deck.tl-column.vue:
  is-media-only: "メディア投稿のみ"
  is-media-view: "メディアビュー"
--- a/locales/zh.yml
+++ b/locales/zh.yml
@ -66,6 +66,7 @@ common:
    congrats: "おめでとう"
    angry: "おこ"
    confused: "こまこまのこまり"
+    rip: "RIP"
    pudding: "Pudding"
  note-placeholders:
    a: "今どうしてる？"
@ -168,6 +169,9 @@ common/views/components/games/reversi/reversi.vue:
 common/views/components/games/reversi/reversi.game.vue:
  surrender: "投了"
  surrendered: "投了により"
+  is-llotheo: "石の少ない方が勝ち(ロセオ)"
+  looped-map: "ループマップ"
+  can-put-everywhere: "どこでも置けるモード"
 common/views/components/games/reversi/reversi.index.vue:
  title: "Misskey Reversi"
  sub-title: "他のMisskeyユーザーとリバーシで対戦しよう"
@ -780,6 +784,25 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"
+desktop/views/pages/admin/admin.vue:
+  dashboard: "ダッシュボード"
+  drive: "ドライブ"
+  users: "ユーザー"
+  update: "更新"
+desktop/views/pages/admin/admin.dashboard.vue:
+  dashboard: "ダッシュボード"
+  all-users: "全てのユーザー"
+  original-users: "このインスタンスのユーザー"
+  all-notes: "全てのノート"
+  original-notes: "このインスタンスのノート"
+desktop/views/pages/admin/admin.suspend-user.vue:
+  suspend-user: "ユーザーの凍結"
+  suspend: "凍結"
+  suspended: "凍結しました"
+desktop/views/pages/admin/admin.unsuspend-user.vue:
+  unsuspend-user: "ユーザーの凍結の解除"
+  unsuspend: "凍結の解除"
+  unsuspended: "凍結を解除しました"
 desktop/views/pages/deck/deck.tl-column.vue:
  is-media-only: "メディア投稿のみ"
  is-media-view: "メディアビュー"
--- a/package.json
+++ b/package.json
@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "5.21.0",
-	"clientVersion": "1.0.8117",
+	"version": "6.0.0",
+	"clientVersion": "1.0.8367",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
@ -31,6 +31,7 @@
 		"@types/dateformat": "1.0.1",
 		"@types/debug": "0.0.30",
 		"@types/deep-equal": "1.0.1",
+		"@types/double-ended-queue": "2.1.0",
 		"@types/elasticsearch": "5.0.25",
 		"@types/file-type": "5.2.1",
 		"@types/gulp": "3.8.36",
@ -57,9 +58,9 @@
 		"@types/minio": "6.0.2",
 		"@types/mkdirp": "0.5.2",
 		"@types/mocha": "5.2.3",
-		"@types/mongodb": "3.1.3",
+		"@types/mongodb": "3.1.4",
 		"@types/ms": "0.7.30",
-		"@types/node": "10.5.8",
+		"@types/node": "10.7.1",
 		"@types/portscanner": "2.1.0",
 		"@types/pug": "2.0.4",
 		"@types/qrcode": "1.2.0",
@ -76,10 +77,10 @@
 		"@types/systeminformation": "3.23.0",
 		"@types/tmp": "0.0.33",
 		"@types/uuid": "3.4.3",
-		"@types/webpack": "4.4.9",
+		"@types/webpack": "4.4.10",
 		"@types/webpack-stream": "3.2.10",
 		"@types/websocket": "0.0.39",
-		"@types/ws": "5.1.2",
+		"@types/ws": "6.0.0",
 		"animejs": "2.2.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
@ -97,6 +98,7 @@
 		"deepcopy": "0.6.3",
 		"diskusage": "0.2.4",
 		"dompurify": "1.0.5",
+		"double-ended-queue": "2.1.0-0",
 		"elasticsearch": "15.1.1",
 		"element-ui": "2.4.6",
 		"emojilib": "2.3.0",
@ -145,8 +147,9 @@
 		"koa-slow": "2.1.0",
 		"koa-views": "6.1.4",
 		"loader-utils": "1.1.0",
+		"lodash.assign": "4.2.0",
 		"mecab-async": "0.1.2",
-		"minio": "6.0.0",
+		"minio": "7.0.0",
 		"mkdirp": "0.5.1",
 		"mocha": "5.2.0",
 		"moji": "0.5.1",
@ -160,7 +163,7 @@
 		"object-assign-deep": "0.4.0",
 		"on-build-webpack": "0.1.0",
 		"os-utils": "0.0.14",
-		"parse5": "5.0.0",
+		"parse5": "5.1.0",
 		"portscanner": "2.2.0",
 		"progress-bar-webpack-plugin": "1.11.0",
 		"promise-sequential": "1.1.1",
@ -177,7 +180,7 @@
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
 		"sass-loader": "7.1.0",
-		"seedrandom": "2.4.3",
+		"seedrandom": "2.4.4",
 		"sharp": "0.20.5",
 		"showdown": "1.8.6",
 		"showdown-highlightjs-extension": "0.1.2",
@ -187,27 +190,27 @@
 		"style-loader": "0.22.1",
 		"stylus": "0.54.5",
 		"stylus-loader": "3.0.2",
-		"summaly": "2.1.2",
+		"summaly": "2.1.3",
 		"systeminformation": "3.42.9",
 		"syuilo-password-strength": "0.0.1",
 		"textarea-caret": "3.1.0",
 		"tmp": "0.0.33",
 		"ts-loader": "4.4.1",
-		"ts-node": "7.0.0",
+		"ts-node": "7.0.1",
 		"tslint": "5.10.0",
 		"typescript": "2.9.2",
 		"typescript-eslint-parser": "18.0.0",
 		"uglify-es": "3.3.9",
-		"url-loader": "1.0.1",
+		"url-loader": "1.1.0",
 		"uuid": "3.3.2",
 		"v-animate-css": "0.0.2",
 		"vue": "2.5.17",
 		"vue-cropperjs": "2.2.1",
-		"vue-js-modal": "1.3.16",
+		"vue-js-modal": "1.3.17",
 		"vue-json-tree-view": "2.1.4",
 		"vue-loader": "15.3.0",
 		"vue-router": "3.0.1",
-		"vue-style-loader": "4.1.1",
+		"vue-style-loader": "4.1.2",
 		"vue-template-compiler": "2.5.17",
 		"vuedraggable": "2.16.0",
 		"vuex": "3.0.1",
--- a/src/client/app/common/scripts/get-kao.ts
+++ b/src/client/app/common/scripts/get-kao.ts
@ -1,5 +1,9 @@
-export default () => [
+const kaos = [
 	'(=^・・^=)',
 	'v(\'ω\')v',
-	'🐡( \'-\' 🐡 )ﾌｸﾞﾊﾟﾝﾁ!!!!'
-][Math.floor(Math.random() * 3)];
+	'🐡( \'-\' 🐡 )ﾌｸﾞﾊﾟﾝﾁ!!!!',
+	'🖕(´･_･`)🖕',
+	'(｡>﹏<｡)'
+];
+
+export default () => kaos[Math.floor(Math.random() * kaos.length)];
--- a/src/client/app/common/views/components/avatar.vue
+++ b/src/client/app/common/views/components/avatar.vue
@ -1,8 +1,16 @@
 <template>
-	<span class="mk-avatar" :title="user | acct" :style="style" v-if="disableLink && !disablePreview" v-user-preview="user.id" @click="onClick"></span>
-	<span class="mk-avatar" :title="user | acct" :style="style" v-else-if="disableLink && disablePreview" @click="onClick"></span>
-	<router-link class="mk-avatar" :to="user | userPage" :title="user | acct" :target="target" :style="style" v-else-if="!disableLink && !disablePreview" v-user-preview="user.id"></router-link>
-	<router-link class="mk-avatar" :to="user | userPage" :title="user | acct" :target="target" :style="style" v-else-if="!disableLink && disablePreview"></router-link>
+	<span class="mk-avatar" :class="{ cat }" :title="user | acct" v-if="disableLink && !disablePreview" v-user-preview="user.id" @click="onClick">
+		<span class="inner" :style="style"></span>
+	</span>
+	<span class="mk-avatar" :class="{ cat }" :title="user | acct" v-else-if="disableLink && disablePreview" @click="onClick">
+		<span class="inner" :style="style"></span>
+	</span>
+	<router-link class="mk-avatar" :class="{ cat }" :to="user | userPage" :title="user | acct" :target="target" v-else-if="!disableLink && !disablePreview" v-user-preview="user.id">
+		<span class="inner" :style="style"></span>
+	</router-link>
+	<router-link class="mk-avatar" :class="{ cat }" :to="user | userPage" :title="user | acct" :target="target" v-else-if="!disableLink && disablePreview">
+		<span class="inner" :style="style"></span>
+	</router-link>
 </template>

 <script lang="ts">
@ -30,14 +38,17 @@ export default Vue.extend({
 		lightmode(): boolean {
 			return this.$store.state.device.lightmode;
 		},
+		cat(): boolean {
+			return this.user.isCat && this.$store.state.settings.circleIcons;
+		},
 		style(): any {
 			return {
 				backgroundColor: this.lightmode
-					? `rgb(${ this.user.avatarColor.slice(0, 3).join(',') })`
+					? `rgb(${this.user.avatarColor.slice(0, 3).join(',')})`
 					: this.user.avatarColor && this.user.avatarColor.length == 3
-						? `rgb(${ this.user.avatarColor.join(',') })`
+						? `rgb(${this.user.avatarColor.join(',')})`
 						: null,
-				backgroundImage: this.lightmode ? null : `url(${ this.user.avatarUrl })`,
+				backgroundImage: this.lightmode ? null : `url(${this.user.avatarUrl})`,
 				borderRadius: this.$store.state.settings.circleIcons ? '100%' : null
 			};
 		}
@ -51,10 +62,47 @@ export default Vue.extend({
 </script>

 <style lang="stylus" scoped>
-.mk-avatar
+
+root(isDark)
 	display inline-block
 	vertical-align bottom
-	background-size cover
+
+	&:not(.cat)
+		overflow hidden
+		border-radius 8px
+
+	&.cat::before,
+	&.cat::after
+		background #df548f
+		border solid 4px isDark ? #e0eefd : #202224
+		box-sizing border-box
+		content ''
+		display inline-block
+		height 50%
+		width 50%
+
+	&.cat::before
+		border-radius 0 75% 75%
+		transform rotate(37.5deg) skew(30deg)
+
+	&.cat::after
+		border-radius 75% 0 75% 75%
+		transform rotate(-37.5deg) skew(-30deg)
+
+	.inner
 		background-position center center
+		background-size cover
+		bottom 0
+		left 0
+		position absolute
+		right 0
+		top 0
 		transition border-radius 1s ease
+		z-index 1
+
+.mk-avatar[data-darkmode]
+	root(true)
+
+.mk-avatar:not([data-darkmode])
+	root(false)
 </style>
--- a/src/client/app/common/views/components/games/reversi/reversi.game.vue
+++ b/src/client/app/common/views/components/games/reversi/reversi.game.vue
@ -60,6 +60,12 @@
 			<el-button type="primary" @click="logPos = logs.length" :disabled="logPos == logs.length">%fa:angle-double-right%</el-button>
 		</el-button-group>
 	</div>
+
+	<div class="info">
+		<p v-if="game.settings.isLlotheo">%i18n:@is-llotheo%</p>
+		<p v-if="game.settings.loopedBoard">%i18n:@looped-map%</p>
+		<p v-if="game.settings.canPutEverywhere">%i18n:@can-put-everywhere%</p>
+	</div>
 </div>
 </template>

--- a/src/client/app/common/views/components/note-header.vue
+++ b/src/client/app/common/views/components/note-header.vue
@ -2,7 +2,7 @@
 <header class="bvonvjxbwzaiskogyhbwgyxvcgserpmu">
 	<mk-avatar class="avatar" :user="note.user" v-if="$store.state.device.postStyle == 'smart'"/>
 	<router-link class="name" :to="note.user | userPage" v-user-preview="note.user.id">{{ note.user | userName }}</router-link>
-	<span class="is-verified" v-if="note.user.isVerified" title="%i18n:common.verified-user%">%fa:bookmark%</span>
+	<span class="is-verified" v-if="note.user.isVerified" title="%i18n:common.verified-user%">%fa:star%</span>
 	<span class="is-admin" v-if="note.user.isAdmin">admin</span>
 	<span class="is-bot" v-if="note.user.isBot">bot</span>
 	<span class="is-cat" v-if="note.user.isCat">cat</span>
--- a/src/client/app/common/views/components/reaction-icon.vue
+++ b/src/client/app/common/views/components/reaction-icon.vue
@ -8,6 +8,7 @@
 	<img v-if="reaction == 'congrats'" src="/assets/reactions/congrats.png" alt="%i18n:common.reactions.congrats%">
 	<img v-if="reaction == 'angry'" src="/assets/reactions/angry.png" alt="%i18n:common.reactions.angry%">
 	<img v-if="reaction == 'confused'" src="/assets/reactions/confused.png" alt="%i18n:common.reactions.confused%">
+	<img v-if="reaction == 'rip'" src="/assets/reactions/rip.png" alt="%i18n:common.reactions.rip%">
 	<template v-if="reaction == 'pudding'">
 		<img v-if="$store.getters.isSignedIn && $store.state.settings.iLikeSushi" src="/assets/reactions/sushi.png" alt="%i18n:common.reactions.pudding%">
 		<img v-else src="/assets/reactions/pudding.png" alt="%i18n:common.reactions.pudding%">
--- a/src/client/app/common/views/components/reaction-picker.vue
+++ b/src/client/app/common/views/components/reaction-picker.vue
@ -10,9 +10,10 @@
 			<button @click="react('hmm')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="4" title="%i18n:common.reactions.hmm%"><mk-reaction-icon reaction='hmm'/></button>
 			<button @click="react('surprise')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="5" title="%i18n:common.reactions.surprise%"><mk-reaction-icon reaction='surprise'/></button>
 			<button @click="react('congrats')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="6" title="%i18n:common.reactions.congrats%"><mk-reaction-icon reaction='congrats'/></button>
-			<button @click="react('angry')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="4" title="%i18n:common.reactions.angry%"><mk-reaction-icon reaction='angry'/></button>
-			<button @click="react('confused')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="5" title="%i18n:common.reactions.confused%"><mk-reaction-icon reaction='confused'/></button>
-			<button @click="react('pudding')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="6" title="%i18n:common.reactions.pudding%"><mk-reaction-icon reaction='pudding'/></button>
+			<button @click="react('angry')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="7" title="%i18n:common.reactions.angry%"><mk-reaction-icon reaction='angry'/></button>
+			<button @click="react('confused')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="8" title="%i18n:common.reactions.confused%"><mk-reaction-icon reaction='confused'/></button>
+			<button @click="react('rip')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="9" title="%i18n:common.reactions.rip%"><mk-reaction-icon reaction='rip'/></button>
+			<button @click="react('pudding')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="10" title="%i18n:common.reactions.pudding%"><mk-reaction-icon reaction='pudding'/></button>
 		</div>
 	</div>
 </div>
--- a/src/client/app/common/views/components/reactions-viewer.vue
+++ b/src/client/app/common/views/components/reactions-viewer.vue
@ -1,15 +1,16 @@
 <template>
 <div class="mk-reactions-viewer">
 	<template v-if="reactions">
-		<span v-if="reactions.like"><mk-reaction-icon reaction="like"/><span>{{ reactions.like }}</span></span>
-		<span v-if="reactions.love"><mk-reaction-icon reaction="love"/><span>{{ reactions.love }}</span></span>
-		<span v-if="reactions.laugh"><mk-reaction-icon reaction="laugh"/><span>{{ reactions.laugh }}</span></span>
-		<span v-if="reactions.hmm"><mk-reaction-icon reaction="hmm"/><span>{{ reactions.hmm }}</span></span>
-		<span v-if="reactions.surprise"><mk-reaction-icon reaction="surprise"/><span>{{ reactions.surprise }}</span></span>
-		<span v-if="reactions.congrats"><mk-reaction-icon reaction="congrats"/><span>{{ reactions.congrats }}</span></span>
-		<span v-if="reactions.angry"><mk-reaction-icon reaction="angry"/><span>{{ reactions.angry }}</span></span>
-		<span v-if="reactions.confused"><mk-reaction-icon reaction="confused"/><span>{{ reactions.confused }}</span></span>
-		<span v-if="reactions.pudding"><mk-reaction-icon reaction="pudding"/><span>{{ reactions.pudding }}</span></span>
+		<span :class="{notReacted}" @click="react('like')" v-if="reactions.like"><mk-reaction-icon reaction="like"/><span>{{ reactions.like }}</span></span>
+		<span :class="{notReacted}" @click="react('love')" v-if="reactions.love"><mk-reaction-icon reaction="love"/><span>{{ reactions.love }}</span></span>
+		<span :class="{notReacted}" @click="react('laugh')" v-if="reactions.laugh"><mk-reaction-icon reaction="laugh"/><span>{{ reactions.laugh }}</span></span>
+		<span :class="{notReacted}" @click="react('hmm')" v-if="reactions.hmm"><mk-reaction-icon reaction="hmm"/><span>{{ reactions.hmm }}</span></span>
+		<span :class="{notReacted}" @click="react('surprise')" v-if="reactions.surprise"><mk-reaction-icon reaction="surprise"/><span>{{ reactions.surprise }}</span></span>
+		<span :class="{notReacted}" @click="react('congrats')" v-if="reactions.congrats"><mk-reaction-icon reaction="congrats"/><span>{{ reactions.congrats }}</span></span>
+		<span :class="{notReacted}" @click="react('angry')" v-if="reactions.angry"><mk-reaction-icon reaction="angry"/><span>{{ reactions.angry }}</span></span>
+		<span :class="{notReacted}" @click="react('confused')" v-if="reactions.confused"><mk-reaction-icon reaction="confused"/><span>{{ reactions.confused }}</span></span>
+		<span :class="{notReacted}" @click="react('rip')" v-if="reactions.rip"><mk-reaction-icon reaction="rip"/><span>{{ reactions.rip }}</span></span>
+		<span :class="{notReacted}" @click="react('pudding')" v-if="reactions.pudding"><mk-reaction-icon reaction="pudding"/><span>{{ reactions.pudding }}</span></span>
 	</template>
 </div>
 </template>
@ -21,6 +22,17 @@ export default Vue.extend({
 	computed: {
 		reactions(): number {
 			return this.note.reactionCounts;
+		},
+		notReacted(): boolean {
+			return this.note.myReaction == null;
+		}
+	},
+	methods: {
+		react(reaction: string) {
+			(this as any).api('notes/reactions/create', {
+				noteId: this.note.id,
+				reaction: reaction
+			});
 		}
 	}
 });
@ -39,6 +51,9 @@ root(isDark)
 	> span
 		margin-right 8px

+		&.notReacted
+			cursor pointer
+
 		> .mk-reaction-icon
 			font-size 1.4em

--- a/src/client/app/common/views/components/signin.vue
+++ b/src/client/app/common/views/components/signin.vue
@ -12,13 +12,13 @@
 	</ui-input>
 	<ui-input v-if="user && user.twoFactorEnabled" v-model="token" type="number" required/>
 	<ui-button type="submit" :disabled="signing">{{ signing ? '%i18n:@signing-in%' : '%i18n:@signin%' }}</ui-button>
-	<p style="margin: 8px 0;">%i18n:@or%<a :href="`${apiUrl}/signin/twitter`">%i18n:@signin-with-twitter%</a></p>
+	<p style="margin: 8px 0;" v-if="twitterIntegration">%i18n:@or%<a :href="`${apiUrl}/signin/twitter`">%i18n:@signin-with-twitter%</a></p>
 </form>
 </template>

 <script lang="ts">
 import Vue from 'vue';
-import { apiUrl, host } from '../../../config';
+import { apiUrl, host, twitterIntegration } from '../../../config';

 export default Vue.extend({
 	props: {
@ -36,7 +36,8 @@ export default Vue.extend({
 			password: '',
 			token: '',
 			apiUrl,
-			host
+			host,
+			twitterIntegration
 		};
 	},
 	methods: {
--- a/src/client/app/common/views/components/url-preview.vue
+++ b/src/client/app/common/views/components/url-preview.vue
@ -1,13 +1,5 @@
 <template>
-<iframe v-if="youtubeId" type="text/html" height="250"
-	:src="`https://www.youtube.com/embed/${youtubeId}?origin=${misskeyUrl}`"
-	frameborder="0"/>
-<iframe v-else-if="spotifyId"
-	:src="`https://open.spotify.com/embed/track/${spotifyId}`"
-	frameborder="0" allowtransparency="true" allow="encrypted-media" />
-<iframe v-else-if="nicovideoId"
-	:src="`https://embed.nicovideo.jp/watch/${nicovideoId}?oldScript=1&referer=${misskeyUrl}&from=${position || '0'}&allowProgrammaticFullScreen=1`"
-	frameborder="0" allow="autoplay; encrypted-media" allowfullscreen />
+<iframe v-if="player" :src="player" heigth="250" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen />
 <div v-else-if="tweetUrl && detail" class="twitter">
 	<blockquote ref="tweet" class="twitter-tweet" :data-theme="$store.state.device.darkmode ? 'dark' : null">
 		<a :href="url"></a>
@ -54,10 +46,7 @@ export default Vue.extend({
 			thumbnail: null,
 			icon: null,
 			sitename: null,
-			youtubeId: null,
-			spotifyId: null,
-			nicovideoId: null,
-			position: null,
+			player: null,
 			tweetUrl: null,
 			misskeyUrl
 		};
@ -65,23 +54,7 @@ export default Vue.extend({
 	created() {
 		const url = new URL(this.url);

-		if (url.hostname == 'www.youtube.com') {
-			this.youtubeId = url.searchParams.get('v');
-			return;
-		} else if (url.hostname == 'youtu.be') {
-			this.youtubeId = url.pathname;
-			return;
-		} else if (url.hostname == 'open.spotify.com') {
-			this.spotifyId = url.pathname.split('/').reverse().filter(x => x !== '')[0];
-			return;
-		} else if (['nicovideo.jp', 'www.nicovideo.jp', 'nico.ms'].includes(url.hostname)) {
-			const id = url.pathname.split('/').reverse().filter(x => x !== '')[0];
-			if (['sm', 'nm', 'ax', 'ca', 'cd', 'cw', 'fx', 'ig', 'na', 'om', 'sd', 'sk', 'yk', 'yo', 'za', 'zb', 'zc', 'zd', 'ze', 'nl', 'so', ...Array(10).keys()].some(x => id.startsWith(x)) {
-				this.nicovideoId = id;
-				this.position = url.searchParams.get('from');
-				return;
-			}
-		} else if (this.detail && url.hostname == 'twitter.com' && /^\/.+\/status(es)?\/\d+/.test(url.pathname)) {
+		if (this.detail && url.hostname == 'twitter.com' && /^\/.+\/status(es)?\/\d+/.test(url.pathname)) {
 			this.tweetUrl = url;
 			const twttr = (window as any).twttr || {};
 			const loadTweet = () => twttr.widgets.load(this.$refs.tweet);
@ -104,16 +77,95 @@ export default Vue.extend({
 		}
 		fetch('/url?url=' + encodeURIComponent(this.url)).then(res => {
 			res.json().then(info => {
+				if (info.url != null) {
 					this.title = info.title;
 					this.description = info.description;
 					this.thumbnail = info.thumbnail;
 					this.icon = info.icon;
 					this.sitename = info.sitename;
-
 					this.fetching = false;
-			});
-		});
-	}
+					if ([ // THIS IS THE WHITELIST FOR THE EMBED PLAYER
+						'afreecatv.com',
+						'aparat.com',
+						'applemusic.com',
+						'amazon.com',
+						'awa.fm',
+						'bandcamp.com',
+						'bbc.co.uk',
+						'beatport.com',
+						'bilibili.com',
+						'boomstream.com',
+						'breakers.tv',
+						'cam4.com',
+						'cavelis.net',
+						'chaturbate.com',
+						'cnn.com',
+						'cybergame.tv',
+						'dailymotion.com',
+						'deezer.com',
+						'djlive.pl',
+						'e-onkyo.com',
+						'eventials.com',
+						'facebook.com',
+						'fc2.com',
+						'gameplank.tv',
+						'goodgame.ru',
+						'google.com',
+						'hardtunes.com',
+						'instagram.com',
+						'johnnylooch.com',
+						'kexp.org',
+						'lahzenegar.com',
+						'liveedu.tv',
+						'livetube.cc',
+						'livestream.com',
+						'meridix.com',
+						'mixcloud.com',
+						'mixer.com',
+						'mobcrush.com',
+						'mylive.in.th',
+						'myspace.com',
+						'netflix.com',
+						'newretrowave.com',
+						'nhk.or.jp',
+						'nicovideo.jp',
+						'nico.ms',
+						'noisetrade.com',
+						'nood.tv',
+						'npr.org',
+						'openrec.tv',
+						'pandora.com',
+						'pandora.tv',
+						'picarto.tv',
+						'pscp.tv',
+						'restream.io',
+						'reverbnation.com',
+						'sermonaudio.com',
+						'smashcast.tv',
+						'songkick.com',
+						'soundcloud.com',
+						'spinninrecords.com',
+						'spotify.com',
+						'stitcher.com',
+						'stream.me',
+						'switchboard.live',
+						'tunein.com',
+						'twitcasting.tv',
+						'twitch.tv',
+						'twitter.com',
+						'vaughnlive.tv',
+						'veoh.com',
+						'vimeo.com',
+						'watchpeoplecode.com',
+						'web.tv',
+						'youtube.com',
+						'youtu.be'
+					].some(x => x == url.hostname || url.hostname.endsWith(`.${x}`)))
+						this.player = info.player;
+				}	// info.url
+			})	// json
+		});	// fetch
+	}	// created
 });
 </script>

--- a/src/client/app/config.ts
+++ b/src/client/app/config.ts
@ -22,6 +22,7 @@ declare const _CODENAME_: string;
 declare const _LICENSE_: string;
 declare const _GOOGLE_MAPS_API_KEY_: string;
 declare const _WELCOME_BG_URL_: string;
+declare const _TWITTER_INTEGRATION_: boolean;

 export const host = _HOST_;
 export const hostname = _HOSTNAME_;
@ -47,3 +48,4 @@ export const codename = _CODENAME_;
 export const license = _LICENSE_;
 export const googleMapsApiKey = _GOOGLE_MAPS_API_KEY_;
 export const welcomeBgUrl = _WELCOME_BG_URL_;
+export const twitterIntegration = _TWITTER_INTEGRATION_;
--- a/src/client/app/desktop/script.ts
+++ b/src/client/app/desktop/script.ts
@ -24,6 +24,7 @@ import updateBanner from './api/update-banner';

 import MkIndex from './views/pages/index.vue';
 import MkDeck from './views/pages/deck/deck.vue';
+import MkAdmin from './views/pages/admin/admin.vue';
 import MkUser from './views/pages/user/user.vue';
 import MkFavorites from './views/pages/favorites.vue';
 import MkSelectDrive from './views/pages/selectdrive.vue';
@ -55,6 +56,7 @@ init(async (launch) => {
 		routes: [
 			{ path: '/', name: 'index', component: MkIndex },
 			{ path: '/deck', name: 'deck', component: MkDeck },
+			{ path: '/admin', name: 'admin', component: MkAdmin },
 			{ path: '/i/customize-home', component: MkHomeCustomize },
 			{ path: '/i/favorites', component: MkFavorites },
 			{ path: '/i/messaging/:user', component: MkMessagingRoom },
--- a/src/client/app/desktop/views/components/drive.file.vue
+++ b/src/client/app/desktop/views/components/drive.file.vue
@ -16,7 +16,7 @@
 		<p>%i18n:@banner%</p>
 	</div>
 	<div class="thumbnail" ref="thumbnail" :style="`background-color: ${ background }`">
-		<img :src="file.url" alt="" @load="onThumbnailLoaded"/>
+		<img :src="file.thumbnailUrl" alt="" @load="onThumbnailLoaded"/>
 	</div>
 	<p class="name">
 		<span>{{ file.name.lastIndexOf('.') != -1 ? file.name.substr(0, file.name.lastIndexOf('.')) : file.name }}</span>
@ -99,7 +99,7 @@ export default Vue.extend({
 					text: '%i18n:@contextmenu.set-as-banner%',
 					action: this.setAsBanner
 				}]
-			}, {
+			}, /*{
 				type: 'nest',
 				text: '%i18n:@contextmenu.open-in-app%',
 				menu: [{
@ -107,7 +107,7 @@ export default Vue.extend({
 					text: '%i18n:@contextmenu.add-app%...',
 					action: this.addApp
 				}]
-			}], {
+			}*/], {
 					closed: () => {
 						this.isContextmenuShowing = false;
 					}
--- a/src/client/app/desktop/views/components/drive.folder.vue
+++ b/src/client/app/desktop/views/components/drive.folder.vue
@ -67,12 +67,12 @@ export default Vue.extend({
 				text: '%i18n:@contextmenu.rename%',
 				icon: '%fa:i-cursor%',
 				action: this.rename
-			}, null, {
+			}/*, null, {
 				type: 'item',
 				text: '%i18n:common.delete%',
 				icon: '%fa:R trash-alt%',
 				action: this.deleteFolder
-			}], {
+			}*/], {
 					closed: () => {
 						this.isContextmenuShowing = false;
 					}
--- a/src/client/app/desktop/views/components/drive.vue
+++ b/src/client/app/desktop/views/components/drive.vue
@ -567,6 +567,7 @@ export default Vue.extend({
 			// ファイル一覧取得
 			(this as any).api('drive/files', {
 				folderId: this.folder ? this.folder.id : null,
+				untilId: this.files[this.files.length - 1].id,
 				limit: max + 1
 			}).then(files => {
 				if (files.length == max + 1) {
--- a/src/client/app/desktop/views/components/media-image.vue
+++ b/src/client/app/desktop/views/components/media-image.vue
@ -37,7 +37,7 @@ export default Vue.extend({
 		style(): any {
 			return {
 				'background-color': this.image.properties.avgColor && this.image.properties.avgColor.length == 3 ? `rgb(${this.image.properties.avgColor.join(',')})` : 'transparent',
-				'background-image': this.raw ? `url(${this.image.url})` : `url(${this.image.url})`
+				'background-image': this.raw ? `url(${this.image.url})` : `url(${this.image.thumbnailUrl})`
 			};
 		}
 	},
--- a/src/client/app/desktop/views/components/ui.header.vue
+++ b/src/client/app/desktop/views/components/ui.header.vue
@ -155,10 +155,15 @@ root(isDark)
 				max-width 1300px
 				margin 0 auto

+				> *
+					position absolute
+					height 48px
+
 				> .center
-					margin auto
+					right 0

 					> .icon
+						margin auto
 						display block
 						width 48px
 						height 48px
@ -169,11 +174,12 @@ root(isDark)
 						opacity 0.3
 						cursor pointer

-				> .left
-					height 48px
+				> .left,
+				> .center
+					left 0

 				> .right
-					height 48px
+					right 0

 					> *
 						display inline-block
--- a/src/client/app/desktop/views/components/user-preview.vue
+++ b/src/client/app/desktop/views/components/user-preview.vue
@ -10,13 +10,13 @@
 		<div class="description">{{ u.description }}</div>
 		<div class="status">
 			<div>
-				<p>%i18n:@notes%</p><a>{{ u.notesCount }}</a>
+				<p>%i18n:@notes%</p><span>{{ u.notesCount }}</span>
 			</div>
 			<div>
-				<p>%i18n:@following%</p><a>{{ u.followingCount }}</a>
+				<p>%i18n:@following%</p><span>{{ u.followingCount }}</span>
 			</div>
 			<div>
-				<p>%i18n:@followers%</p><a>{{ u.followersCount }}</a>
+				<p>%i18n:@followers%</p><span>{{ u.followersCount }}</span>
 			</div>
 		</div>
 		<mk-follow-button v-if="$store.getters.isSignedIn && u.id != $store.state.i.id" :user="u"/>
@ -149,7 +149,7 @@ root(isDark)
 				font-size 0.7em
 				color #aaa

-			> a
+			> span
 				font-size 1em
 				color $theme-color

--- a/src/client/app/desktop/views/pages/admin/admin.dashboard.vue
+++ b/src/client/app/desktop/views/pages/admin/admin.dashboard.vue
@ -0,0 +1,37 @@
+<template>
+<div>
+	<h1>%i18n:@dashboard%</h1>
+	<div v-if="stats">
+		<p><b>%i18n:@all-users%</b>: <span>{{ stats.usersCount | number }}</span></p>
+		<p><b>%i18n:@original-users%</b>: <span>{{ stats.originalUsersCount | number }}</span></p>
+		<p><b>%i18n:@all-notes%</b>: <span>{{ stats.notesCount | number }}</span></p>
+		<p><b>%i18n:@original-notes%</b>: <span>{{ stats.originalNotesCount | number }}</span></p>
+	</div>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from "vue";
+
+export default Vue.extend({
+	data() {
+		return {
+			stats: null
+		};
+	},
+	created() {
+		(this as any).api('stats').then(stats => {
+			this.stats = stats;
+		});
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+h1
+	margin 0 0 1em 0
+	padding 0 0 8px 0
+	font-size 1em
+	color #555
+	border-bottom solid 1px #eee
+</style>
--- a/src/client/app/desktop/views/pages/admin/admin.suspend-user.vue
+++ b/src/client/app/desktop/views/pages/admin/admin.suspend-user.vue
@ -0,0 +1,51 @@
+<template>
+<div>
+	<header>%i18n:@suspend-user%</header>
+	<input v-model="username" type="text" class="ui"/>
+	<button class="ui" @click="suspendUser" :disabled="suspending">%i18n:@suspend%</button>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from "vue";
+import parseAcct from "../../../../../../misc/acct/parse";
+
+export default Vue.extend({
+	data() {
+		return {
+			username: null,
+			suspending: false
+		};
+	},
+	methods: {
+		async suspendUser() {
+			this.suspending = true;
+
+			const user = await (this as any).os.api(
+				"users/show",
+				parseAcct(this.username)
+			);
+
+			await (this as any).os.api("admin/suspend-user", {
+				userId: user.id
+			});
+
+			this.suspending = false;
+
+			(this as any).os.apis.dialog({ text: "%i18n:@suspended%" });
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+header
+	margin 10px 0
+
+
+button
+	margin 16px 0
+
+</style>
--- a/src/client/app/desktop/views/pages/admin/admin.unsuspend-user.vue
+++ b/src/client/app/desktop/views/pages/admin/admin.unsuspend-user.vue
@ -0,0 +1,51 @@
+<template>
+<div>
+	<header>%i18n:@unsuspend-user%</header>
+	<input v-model="username" type="text" class="ui"/>
+	<button class="ui" @click="unsuspendUser" :disabled="unsuspending">%i18n:@unsuspend%</button>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from "vue";
+import parseAcct from "../../../../../../misc/acct/parse";
+
+export default Vue.extend({
+	data() {
+		return {
+			username: null,
+			unsuspending: false
+		};
+	},
+	methods: {
+		async unsuspendUser() {
+			this.unsuspending = true;
+
+			const user = await (this as any).os.api(
+				"users/show",
+				parseAcct(this.username)
+			);
+
+			await (this as any).os.api("admin/unsuspend-user", {
+				userId: user.id
+			});
+
+			this.unsuspending = false;
+
+			(this as any).os.apis.dialog({ text: "%i18n:@unsuspended%" });
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+header
+	margin 10px 0
+
+
+button
+	margin 16px 0
+
+</style>
--- a/src/client/app/desktop/views/pages/admin/admin.vue
+++ b/src/client/app/desktop/views/pages/admin/admin.vue
@ -0,0 +1,102 @@
+<template>
+<div class="mk-admin">
+	<nav>
+		<ul>
+			<li @click="nav('dashboard')" :class="{ active: page == 'dashboard' }">%fa:chalkboard .fw%%i18n:@dashboard%</li>
+			<li @click="nav('users')" :class="{ active: page == 'users' }">%fa:users .fw%%i18n:@users%</li>
+			<!-- <li @click="nav('drive')" :class="{ active: page == 'drive' }">%fa:cloud .fw%%i18n:@drive%</li> -->
+			<!-- <li @click="nav('update')" :class="{ active: page == 'update' }">%i18n:@update%</li> -->
+		</ul>
+	</nav>
+	<main>
+		<div v-if="page == 'dashboard'">
+			<x-dashboard/>
+		</div>
+		<div v-if="page == 'users'">
+			<x-suspend-user/>
+			<x-unsuspend-user/>
+		</div>
+		<div v-if="page == 'drive'"></div>
+		<div v-if="page == 'update'"></div>
+	</main>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from "vue";
+import XDashboard from "./admin.dashboard.vue";
+import XSuspendUser from "./admin.suspend-user.vue";
+import XUnsuspendUser from "./admin.unsuspend-user.vue";
+
+export default Vue.extend({
+	components: {
+		XDashboard,
+		XSuspendUser,
+		XUnsuspendUser
+	},
+	data() {
+		return {
+			page: 'dashboard'
+		};
+	},
+	methods: {
+		nav(page: string) {
+			this.page = page;
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+.mk-admin
+	display flex
+	height 100%
+	margin 32px
+
+	> nav
+		flex 0 0 250px
+		width 100%
+		height 100%
+		padding 16px 0 0 0
+		overflow auto
+		border-right solid 1px #ddd
+
+		> ul
+			list-style none
+
+			> li
+				display block
+				padding 10px 16px
+				margin 0
+				color #666
+				cursor pointer
+				user-select none
+				transition margin-left 0.2s ease
+
+				> [data-fa]
+					margin-right 4px
+
+
+				&:hover
+					color #555
+
+				&.active
+					margin-left 8px
+					color $theme-color !important
+
+	> main
+		width 100%
+		padding 16px 32px
+
+header
+	margin 10px 0
+
+
+button
+	margin 16px 0
+	position absolute
+	right 0
+
+</style>
--- a/src/client/app/desktop/views/pages/user/user.header.vue
+++ b/src/client/app/desktop/views/pages/user/user.header.vue
@ -176,6 +176,10 @@ root(isDark)
 		height 120px
 		box-shadow 1px 1px 3px rgba(#000, 0.2)

+		> &.cat::before,
+		> &.cat::after
+			border-width 8px
+
 	> .body
 		padding 16px 16px 16px 154px
 		color isDark ? #c5ced6 : #555
--- a/src/client/app/mobile/views/components/drive.file.vue
+++ b/src/client/app/mobile/views/components/drive.file.vue
@ -43,7 +43,7 @@ export default Vue.extend({
 		thumbnail(): any {
 			return {
 				'background-color': this.file.properties.avgColor && this.file.properties.avgColor.length == 3 ? `rgb(${this.file.properties.avgColor.join(',')})` : 'transparent',
-				'background-image': `url(${this.file.url})`
+				'background-image': `url(${this.file.thumbnailUrl})`
 			};
 		}
 	},
--- a/src/client/app/mobile/views/components/media-image.vue
+++ b/src/client/app/mobile/views/components/media-image.vue
@ -27,7 +27,7 @@ export default Vue.extend({
 	},
 	computed: {
 		style(): any {
-			let url = `url(${this.image.url})`;
+			let url = `url(${this.image.thumbnailUrl})`;

 			if (this.$store.state.device.loadRemoteMedia || this.$store.state.device.lightmode) {
 				url = null;
--- a/src/client/assets/reactions/rip.png
+++ b/src/client/assets/reactions/rip.png
--- a/src/const.json
+++ b/src/const.json
@ -1,5 +1,5 @@
 {
 	"copyright": "Copyright (c) 2014-2018 syuilo",
-	"themeColor": "#f66e4f",
+	"themeColor": "#f6584f",
 	"themeColorForeground": "#fff"
 }
--- a/src/daemons/notes-stats.ts
+++ b/src/daemons/notes-stats.ts
@ -1,10 +1,11 @@
 import * as childProcess from 'child_process';
+import * as Deque from 'double-ended-queue';
 import Xev from 'xev';

 const ev = new Xev();

 export default function() {
-	const log: any[] = [];
+	const log = new Deque<any>();

 	const p = childProcess.fork(__dirname + '/notes-stats-child.js');

@ -15,7 +16,7 @@ export default function() {
 	});

 	ev.on('requestNotesStatsLog', id => {
-		ev.emit('notesStatsLog:' + id, log);
+		ev.emit('notesStatsLog:' + id, log.toArray());
 	});

 	process.on('exit', code => {
--- a/src/daemons/server-stats.ts
+++ b/src/daemons/server-stats.ts
@ -1,6 +1,7 @@
 import * as os from 'os';
 import * as sysUtils from 'systeminformation';
 import * as diskusage from 'diskusage';
+import * as Deque from 'double-ended-queue';
 import Xev from 'xev';
 const osUtils = require('os-utils');

@ -12,10 +13,10 @@ const interval = 1000;
 * Report server stats regularly
 */
 export default function() {
-	const log: any[] = [];
+	const log = new Deque<any>();

 	ev.on('requestServerStatsLog', id => {
-		ev.emit('serverStatsLog:' + id, log);
+		ev.emit('serverStatsLog:' + id, log.toArray());
 	});

 	async function tick() {
--- a/src/db/mongodb.ts
+++ b/src/db/mongodb.ts
@ -3,9 +3,7 @@ import config from '../config';
 const u = config.mongodb.user ? encodeURIComponent(config.mongodb.user) : null;
 const p = config.mongodb.pass ? encodeURIComponent(config.mongodb.pass) : null;

-const uri = u && p
-	? `mongodb://${u}:${p}@${config.mongodb.host}:${config.mongodb.port}/${config.mongodb.db}`
-	: `mongodb://${config.mongodb.host}:${config.mongodb.port}/${config.mongodb.db}`;
+const uri = `mongodb://${u && p ? `${u}:${p}@` : ''}${config.mongodb.host}:${config.mongodb.port}/${config.mongodb.db}`;

 /**
 * monk
--- a/src/index.ts
+++ b/src/index.ts
@ -48,7 +48,7 @@ main();
 * Init process
 */
 function main() {
-	process.title = `Misskey (${ cluster.isMaster ? 'master' : 'worker' })`;
+	process.title = `Misskey (${cluster.isMaster ? 'master' : 'worker'})`;

 	if (cluster.isMaster || program.disableClustering) {
 		masterMain();
@ -154,11 +154,10 @@ async function init(): Promise<Config> {

 function checkMongoDb(config: Config) {
 	const mongoDBLogger = new Logger('MongoDB');
-	mongoDBLogger.info(`Host: ${config.mongodb.host}`);
-	mongoDBLogger.info(`Port: ${config.mongodb.port}`);
-	mongoDBLogger.info(`DB: ${config.mongodb.db}`);
-	if (config.mongodb.user) mongoDBLogger.info(`User: ${config.mongodb.user}`);
-	if (config.mongodb.pass) mongoDBLogger.info(`Pass: ****`);
+	const u = config.mongodb.user ? encodeURIComponent(config.mongodb.user) : null;
+	const p = config.mongodb.pass ? encodeURIComponent(config.mongodb.pass) : null;
+	const uri = `mongodb://${u && p ? `${u}:****@` : ''}${config.mongodb.host}:${config.mongodb.port}/${config.mongodb.db}`;
+	mongoDBLogger.info(`Connecting to ${uri}`);
 	require('./db/mongodb');
 	mongoDBLogger.succ('Connectivity confirmed');
 }
--- a/src/mfm/parse/elements/bold.ts
+++ b/src/mfm/parse/elements/bold.ts
@ -15,6 +15,6 @@ export default function(text: string) {
 	return {
 		type: 'bold',
 		content: bold,
-		bold: bold.substr(2, bold.length - 4)
+		bold: match[1]
 	} as TextElementBold;
 }
--- a/src/mfm/parse/elements/code.ts
+++ b/src/mfm/parse/elements/code.ts
@ -18,7 +18,7 @@ export default function(text: string) {
 	return {
 		type: 'code',
 		content: code,
-		code: code.substr(3, code.length - 6).trim(),
-		html: genHtml(code.substr(3, code.length - 6).trim())
+		code: match[1],
+		html: genHtml(match[1].trim())
 	} as TextElementCode;
 }
--- a/src/mfm/parse/elements/emoji.ts
+++ b/src/mfm/parse/elements/emoji.ts
@ -9,12 +9,12 @@ export type TextElementEmoji = {
 };

 export default function(text: string) {
-	const match = text.match(/^:[a-zA-Z0-9+-_]+:/);
+	const match = text.match(/^:([a-zA-Z0-9+-_]+):/);
 	if (!match) return null;
 	const emoji = match[0];
 	return {
 		type: 'emoji',
 		content: emoji,
-		emoji: emoji.substr(1, emoji.length - 2)
+		emoji: match[1]
 	} as TextElementEmoji;
 }
--- a/src/mfm/parse/elements/inline-code.ts
+++ b/src/mfm/parse/elements/inline-code.ts
@ -14,11 +14,12 @@ export type TextElementInlineCode = {
 export default function(text: string) {
 	const match = text.match(/^`(.+?)`/);
 	if (!match) return null;
+	if (match[1].includes('´')) return null;
 	const code = match[0];
 	return {
 		type: 'inline-code',
 		content: code,
-		code: code.substr(1, code.length - 2).trim(),
-		html: genHtml(code.substr(1, code.length - 2).trim())
+		code: match[1],
+		html: genHtml(match[1])
 	} as TextElementInlineCode;
 }
--- a/src/mfm/parse/elements/quote.ts
+++ b/src/mfm/parse/elements/quote.ts
@ -15,6 +15,6 @@ export default function(text: string) {
 	return {
 		type: 'quote',
 		content: quote,
-		quote: quote.substr(1, quote.length - 2).trim(),
+		quote: match[1].trim(),
 	} as TextElementQuote;
 }
--- a/src/mfm/parse/elements/search.ts
+++ b/src/mfm/parse/elements/search.ts
@ -9,7 +9,7 @@ export type TextElementSearch = {
 };

 export default function(text: string) {
-	const match = text.match(/^(.+?) (検索|Search)(\n|$)/i);
+	const match = text.match(/^(.+?)( |　)(検索|\[検索\]|Search|\[Search\])(\n|$)/i);
 	if (!match) return null;
 	return {
 		type: 'search',
--- a/src/misc/get-reaction-emoji.ts
+++ b/src/misc/get-reaction-emoji.ts
@ -8,6 +8,7 @@ export default function(reaction: string): string {
 		case 'congrats': return '🎉';
 		case 'angry': return '💢';
 		case 'confused': return '😥';
+		case 'rip': return '😇';
 		case 'pudding': return '🍮';
 		default: return '';
 	}
--- a/src/models/app.ts
+++ b/src/models/app.ts
@ -13,7 +13,7 @@ export default App;
 export type IApp = {
 	_id: mongo.ObjectID;
 	createdAt: Date;
-	userId: mongo.ObjectID;
+	userId: mongo.ObjectID | null;
 	secret: string;
 	name: string;
 	nameId: string;
--- a/src/models/drive-file.ts
+++ b/src/models/drive-file.ts
@ -10,7 +10,7 @@ import DriveFileThumbnail, { deleteDriveFileThumbnail } from './drive-file-thumb

 const DriveFile = monkDb.get<IDriveFile>('driveFiles.files');
 DriveFile.createIndex('md5');
-DriveFile.createIndex(['metadata.uri', 'metadata.userId'], { sparse: true, unique: true });
+DriveFile.createIndex('metadata.uri');
 export default DriveFile;

 export const DriveFileChunk = monkDb.get('driveFiles.chunks');
@ -31,6 +31,7 @@ export type IMetadata = {
 	comment: string;
 	uri?: string;
 	url?: string;
+	thumbnailUrl?: string;
 	src?: string;
 	deletedAt?: Date;
 	withoutChunks?: boolean;
@ -164,6 +165,7 @@ export const pack = (
 	_target = Object.assign(_target, _file.metadata);

 	_target.url = _file.metadata.url ? _file.metadata.url : `${config.drive_url}/${_target.id}/${encodeURIComponent(_target.name)}`;
+	_target.thumbnailUrl = _file.metadata.thumbnailUrl ? _file.metadata.thumbnailUrl : `${config.drive_url}/${_target.id}/${encodeURIComponent(_target.name)}?thumbnail`;
 	_target.isRemote = _file.metadata.isRemote;

 	if (_target.properties == null) _target.properties = {};
--- a/src/models/note-reaction.ts
+++ b/src/models/note-reaction.ts
@ -26,6 +26,7 @@ export const validateReaction = $.str.or([
 	'congrats',
 	'angry',
 	'confused',
+	'rip',
 	'pudding'
 ]);

--- a/src/models/note.ts
+++ b/src/models/note.ts
@ -340,7 +340,7 @@ export const pack = async (
 	_note = await rap(_note);

 	if (_note.user.isCat && _note.text) {
-		_note.text = _note.text.replace(/な/g, 'にゃ').replace(/ナ/g, 'ニャ');
+		_note.text = _note.text.replace(/な/g, 'にゃ').replace(/ナ/g, 'ニャ').replace(/ﾅ/g, 'ﾆｬ');
 	}

 	if (hide) {
--- a/src/remote/activitypub/models/note.ts
+++ b/src/remote/activitypub/models/note.ts
@ -69,12 +69,13 @@ export async function createNote(value: any, resolver?: Resolver, silent = false
 	if (!note.to.includes('https://www.w3.org/ns/activitystreams#Public')) {
 		if (note.cc.includes('https://www.w3.org/ns/activitystreams#Public')) {
 			visibility = 'home';
+		} else if (note.to.includes(`${actor.uri}/followers`)) {	// TODO: person.followerと照合するべき？
+			visibility = 'followers';
 		} else {
 			visibility = 'specified';
 			visibleUsers = await Promise.all(note.to.map(uri => resolvePerson(uri)));
 		}
 	}
-	if (note.cc.length == 0) visibility = 'followers';
 	//#endergion

 	// 添付メディア
--- a/src/remote/activitypub/renderer/document.ts
+++ b/src/remote/activitypub/renderer/document.ts
@ -4,5 +4,5 @@ import { IDriveFile } from '../../../models/drive-file';
 export default (file: IDriveFile) => ({
 	type: 'Document',
 	mediaType: file.contentType,
-	url: `${config.drive_url}/${file._id}`
+	url: file.metadata.url || `${config.drive_url}/${file._id}`
 });
--- a/src/remote/activitypub/renderer/follow-user.ts
+++ b/src/remote/activitypub/renderer/follow-user.ts
@ -0,0 +1,16 @@
+import config from '../../../config';
+import * as mongo from 'mongodb';
+import User, { isLocalUser } from '../../../models/user';
+
+/**
+ * Convert (local|remote)(Follower|Followee)ID to URL
+ * @param id Follower|Followee ID
+ */
+export default async function renderFollowUser(id: mongo.ObjectID): Promise<any> {
+
+	const user = await User.findOne({
+		_id: id
+	});
+
+	return isLocalUser(user) ? `${config.url}/users/${user._id}` : user.uri;
+}
--- a/src/remote/activitypub/renderer/image.ts
+++ b/src/remote/activitypub/renderer/image.ts
@ -3,6 +3,6 @@ import { IDriveFile } from '../../../models/drive-file';

 export default (file: IDriveFile) => ({
 	type: 'Image',
-	url: `${config.drive_url}/${file._id}`,
+	url: file.metadata.url || `${config.drive_url}/${file._id}`,
 	sensitive: file.metadata.isSensitive
 });
--- a/src/remote/activitypub/renderer/note.ts
+++ b/src/remote/activitypub/renderer/note.ts
@ -50,9 +50,21 @@ export default async function renderNote(note: INote, dive = true): Promise<any>
 		? note.mentionedRemoteUsers.map(x => x.uri)
 		: [];

-	const cc = ['public', 'home', 'followers'].includes(note.visibility)
-		? [`${attributedTo}/followers`].concat(mentions)
-		: [];
+	let to: string[] = [];
+	let cc: string[] = [];
+
+	if (note.visibility == 'public') {
+		to = ['https://www.w3.org/ns/activitystreams#Public'];
+		cc = [`${attributedTo}/followers`].concat(mentions);
+	} else if (note.visibility == 'home') {
+		to = [`${attributedTo}/followers`];
+		cc = ['https://www.w3.org/ns/activitystreams#Public'].concat(mentions);
+	} else if (note.visibility == 'followers') {
+		to = [`${attributedTo}/followers`];
+		cc = mentions;
+	} else {
+		to = mentions;
+	}

 	const mentionedUsers = note.mentions ? await User.find({
 		_id: {
@ -74,7 +86,7 @@ export default async function renderNote(note: INote, dive = true): Promise<any>
 		summary: note.cw,
 		content: toHtml(note),
 		published: note.createdAt.toISOString(),
-		to: 'https://www.w3.org/ns/activitystreams#Public',
+		to,
 		cc,
 		inReplyTo,
 		attachment: (await promisedFiles).map(renderDocument),
--- a/src/remote/activitypub/renderer/ordered-collection-page.ts
+++ b/src/remote/activitypub/renderer/ordered-collection-page.ts
@ -0,0 +1,23 @@
+/**
+ * Render OrderedCollectionPage
+ * @param id URL of self
+ * @param totalItems Number of total items
+ * @param orderedItems Items
+ * @param partOf URL of base
+ * @param prev URL of prev page (optional)
+ * @param next URL of next page (optional)
+ */
+export default function(id: string, totalItems: any, orderedItems: any, partOf: string, prev: string, next: string) {
+	const page = {
+		id,
+		partOf,
+		type: 'OrderedCollectionPage',
+		totalItems,
+		orderedItems
+	} as any;
+
+	if (prev) page.prev = prev;
+	if (next) page.next = next;
+
+	return page;
+}
--- a/src/remote/activitypub/renderer/ordered-collection.ts
+++ b/src/remote/activitypub/renderer/ordered-collection.ts
@ -1,6 +1,19 @@
-export default (id: string, totalItems: any, orderedItems: any) => ({
+/**
+ * Render OrderedCollection
+ * @param id URL of self
+ * @param totalItems Total number of items
+ * @param first URL of first page (optional)
+ * @param last URL of last page (optional)
+ */
+export default function(id: string, totalItems: any, first: string, last: string) {
+	const page: any = {
 		id,
 		type: 'OrderedCollection',
 		totalItems,
-	orderedItems
-});
+	};
+
+	if (first) page.first = first;
+	if (last) page.last = last;
+
+	return page;
+}
--- a/src/remote/activitypub/renderer/person.ts
+++ b/src/remote/activitypub/renderer/person.ts
@ -19,6 +19,8 @@ export default async (user: ILocalUser) => {
 		id,
 		inbox: `${id}/inbox`,
 		outbox: `${id}/outbox`,
+		followers: `${id}/followers`,
+		following: `${id}/following`,
 		sharedInbox: `${config.url}/inbox`,
 		url: `${config.url}/@${user.username}`,
 		preferredUsername: user.username,
--- a/src/server/activitypub.ts
+++ b/src/server/activitypub.ts
@ -10,8 +10,9 @@ import User, { isLocalUser, ILocalUser, IUser } from '../models/user';
 import renderNote from '../remote/activitypub/renderer/note';
 import renderKey from '../remote/activitypub/renderer/key';
 import renderPerson from '../remote/activitypub/renderer/person';
-import renderOrderedCollection from '../remote/activitypub/renderer/ordered-collection';
-import config from '../config';
+import Outbox from './activitypub/outbox';
+import Followers from './activitypub/followers';
+import Following from './activitypub/following';

 // Init router
 const router = new Router();
@ -64,30 +65,14 @@ router.get('/notes/:note', async (ctx, next) => {
 	ctx.body = pack(await renderNote(note));
 });

-// outbot
-router.get('/users/:user/outbox', async ctx => {
-	const userId = new mongo.ObjectID(ctx.params.user);
+// outbox
+router.get('/users/:user/outbox', Outbox);

-	const user = await User.findOne({
-		_id: userId,
-		host: null
-	});
+// followers
+router.get('/users/:user/followers', Followers);

-	if (user === null) {
-		ctx.status = 404;
-		return;
-	}
-
-	const notes = await Note.find({ userId: user._id }, {
-		limit: 10,
-		sort: { _id: -1 }
-	});
-
-	const renderedNotes = await Promise.all(notes.map(note => renderNote(note)));
-	const rendered = renderOrderedCollection(`${config.url}/users/${userId}/inbox`, user.notesCount, renderedNotes);
-
-	ctx.body = pack(rendered);
-});
+// following
+router.get('/users/:user/following', Following);

 // publickey
 router.get('/users/:user/publickey', async ctx => {
--- a/src/server/activitypub/followers.ts
+++ b/src/server/activitypub/followers.ts
@ -0,0 +1,80 @@
+import * as mongo from 'mongodb';
+import * as Koa from 'koa';
+import config from '../../config';
+import $ from 'cafy'; import ID from '../../misc/cafy-id';
+import User from '../../models/user';
+import Following from '../../models/following';
+import pack from '../../remote/activitypub/renderer';
+import renderOrderedCollection from '../../remote/activitypub/renderer/ordered-collection';
+import renderOrderedCollectionPage from '../../remote/activitypub/renderer/ordered-collection-page';
+import renderFollowUser from '../../remote/activitypub/renderer/follow-user';
+
+export default async (ctx: Koa.Context) => {
+	const userId = new mongo.ObjectID(ctx.params.user);
+
+	// Get 'cursor' parameter
+	const [cursor = null, cursorErr] = $.type(ID).optional.get(ctx.request.query.cursor);
+
+	// Get 'page' parameter
+	const pageErr = !$.str.optional.or(['true', 'false']).ok(ctx.request.query.page);
+	const page: boolean = ctx.request.query.page === 'true';
+
+	// Validate parameters
+	if (cursorErr || pageErr) {
+		ctx.status = 400;
+		return;
+	}
+
+	// Verify user
+	const user = await User.findOne({
+		_id: userId,
+		host: null
+	});
+
+	if (user === null) {
+		ctx.status = 404;
+		return;
+	}
+
+	const limit = 10;
+	const partOf = `${config.url}/users/${userId}/followers`;
+
+	if (page) {
+		// Construct query
+		const query = {
+			followeeId: user._id
+		} as any;
+
+		// カーソルが指定されている場合
+		if (cursor) {
+			query._id = {
+				$lt: cursor
+			};
+		}
+
+		// Get followers
+		const followings = await Following
+			.find(query, {
+				limit: limit + 1,
+				sort: { _id: -1 }
+			});
+
+		// 「次のページ」があるかどうか
+		const inStock = followings.length === limit + 1;
+		if (inStock) followings.pop();
+
+		const renderedFollowers = await Promise.all(followings.map(following => renderFollowUser(following.followerId)));
+		const rendered = renderOrderedCollectionPage(
+			`${partOf}?page=true${cursor ? `&cursor=${cursor}` : ''}`,
+			user.followersCount, renderedFollowers, partOf,
+			null,
+			inStock ? `${partOf}?page=true&cursor=${followings[followings.length - 1]._id}` : null
+		);
+
+		ctx.body = pack(rendered);
+	} else {
+		// index page
+		const rendered = renderOrderedCollection(partOf, user.followersCount, `${partOf}?page=true`, null);
+		ctx.body = pack(rendered);
+	}
+};
--- a/src/server/activitypub/following.ts
+++ b/src/server/activitypub/following.ts
@ -0,0 +1,80 @@
+import * as mongo from 'mongodb';
+import * as Koa from 'koa';
+import config from '../../config';
+import $ from 'cafy'; import ID from '../../misc/cafy-id';
+import User from '../../models/user';
+import Following from '../../models/following';
+import pack from '../../remote/activitypub/renderer';
+import renderOrderedCollection from '../../remote/activitypub/renderer/ordered-collection';
+import renderOrderedCollectionPage from '../../remote/activitypub/renderer/ordered-collection-page';
+import renderFollowUser from '../../remote/activitypub/renderer/follow-user';
+
+export default async (ctx: Koa.Context) => {
+	const userId = new mongo.ObjectID(ctx.params.user);
+
+	// Get 'cursor' parameter
+	const [cursor = null, cursorErr] = $.type(ID).optional.get(ctx.request.query.cursor);
+
+	// Get 'page' parameter
+	const pageErr = !$.str.optional.or(['true', 'false']).ok(ctx.request.query.page);
+	const page: boolean = ctx.request.query.page === 'true';
+
+	// Validate parameters
+	if (cursorErr || pageErr) {
+		ctx.status = 400;
+		return;
+	}
+
+	// Verify user
+	const user = await User.findOne({
+		_id: userId,
+		host: null
+	});
+
+	if (user === null) {
+		ctx.status = 404;
+		return;
+	}
+
+	const limit = 10;
+	const partOf = `${config.url}/users/${userId}/following`;
+
+	if (page) {
+		// Construct query
+		const query = {
+			followerId: user._id
+		} as any;
+
+		// カーソルが指定されている場合
+		if (cursor) {
+			query._id = {
+				$lt: cursor
+			};
+		}
+
+		// Get followings
+		const followings = await Following
+			.find(query, {
+				limit: limit + 1,
+				sort: { _id: -1 }
+			});
+
+		// 「次のページ」があるかどうか
+		const inStock = followings.length === limit + 1;
+		if (inStock) followings.pop();
+
+		const renderedFollowees = await Promise.all(followings.map(following => renderFollowUser(following.followeeId)));
+		const rendered = renderOrderedCollectionPage(
+			`${partOf}?page=true${cursor ? `&cursor=${cursor}` : ''}`,
+			user.followingCount, renderedFollowees, partOf,
+			null,
+			inStock ? `${partOf}?page=true&cursor=${followings[followings.length - 1]._id}` : null
+		);
+
+		ctx.body = pack(rendered);
+	} else {
+		// index page
+		const rendered = renderOrderedCollection(partOf, user.followingCount, `${partOf}?page=true`, null);
+		ctx.body = pack(rendered);
+	}
+};
--- a/src/server/activitypub/outbox.ts
+++ b/src/server/activitypub/outbox.ts
@ -0,0 +1,103 @@
+import * as mongo from 'mongodb';
+import * as Koa from 'koa';
+import config from '../../config';
+import $ from 'cafy'; import ID from '../../misc/cafy-id';
+import User from '../../models/user';
+import pack from '../../remote/activitypub/renderer';
+import renderOrderedCollection from '../../remote/activitypub/renderer/ordered-collection';
+import renderOrderedCollectionPage from '../../remote/activitypub/renderer/ordered-collection-page';
+
+import Note from '../../models/note';
+import renderNote from '../../remote/activitypub/renderer/note';
+
+export default async (ctx: Koa.Context) => {
+	const userId = new mongo.ObjectID(ctx.params.user);
+
+	// Get 'sinceId' parameter
+	const [sinceId, sinceIdErr] = $.type(ID).optional.get(ctx.request.query.since_id);
+
+	// Get 'untilId' parameter
+	const [untilId, untilIdErr] = $.type(ID).optional.get(ctx.request.query.until_id);
+
+	// Get 'page' parameter
+	const pageErr = !$.str.optional.or(['true', 'false']).ok(ctx.request.query.page);
+	const page: boolean = ctx.request.query.page === 'true';
+
+	// Validate parameters
+	if (sinceIdErr || untilIdErr || pageErr || [sinceId, untilId].filter(x => x != null).length > 1) {
+		ctx.status = 400;
+		return;
+	}
+
+	// Verify user
+	const user = await User.findOne({
+		_id: userId,
+		host: null
+	});
+
+	if (user === null) {
+		ctx.status = 404;
+		return;
+	}
+
+	const limit = 20;
+	const partOf = `${config.url}/users/${userId}/outbox`;
+
+	if (page) {
+		//#region Construct query
+		const sort = {
+			_id: -1
+		};
+
+		const query = {
+			userId: user._id,
+			$and: [{
+				$or: [ { visibility: 'public' }, { visibility: 'home' } ]
+			}, { // exclude renote, but include quote
+				$or: [{
+					text: { $ne: null }
+				}, {
+					mediaIds: { $ne: [] }
+				}]
+			}]
+		} as any;
+
+		if (sinceId) {
+			sort._id = 1;
+			query._id = {
+				$gt: sinceId
+			};
+		} else if (untilId) {
+			query._id = {
+				$lt: untilId
+			};
+		}
+		//#endregion
+
+		// Issue query
+		const notes = await Note
+			.find(query, {
+				limit: limit,
+				sort: sort
+			});
+
+		if (sinceId) notes.reverse();
+
+		const renderedNotes = await Promise.all(notes.map(note => renderNote(note)));
+		const rendered = renderOrderedCollectionPage(
+			`${partOf}?page=true${sinceId ? `&since_id=${sinceId}` : ''}${untilId ? `&until_id=${untilId}` : ''}`,
+			user.notesCount, renderedNotes, partOf,
+			notes.length > 0 ? `${partOf}?page=true&since_id=${notes[0]._id}` : null,
+			notes.length > 0 ? `${partOf}?page=true&until_id=${notes[notes.length - 1]._id}` : null
+		);
+
+		ctx.body = pack(rendered);
+	} else {
+		// index page
+		const rendered = renderOrderedCollection(partOf, user.notesCount,
+			`${partOf}?page=true`,
+			`${partOf}?page=true&since_id=000000000000000000000000`
+		);
+		ctx.body = pack(rendered);
+	}
+};
--- a/src/server/api/call.ts
+++ b/src/server/api/call.ts
@ -1,6 +1,6 @@
 import { performance } from 'perf_hooks';
 import limitter from './limitter';
-import { IUser } from '../../models/user';
+import { IUser, isLocalUser } from '../../models/user';
 import { IApp } from '../../models/app';
 import endpoints from './endpoints';

@ -21,6 +21,10 @@ export default (endpoint: string, user: IUser, app: IApp, data: any, file?: any)
 		return rej('YOUR_ACCOUNT_HAS_BEEN_SUSPENDED');
 	}

+	if (ep.meta.requireAdmin && !(isLocalUser(user) && user.isAdmin)) {
+		return rej('YOU_ARE_NOT_ADMIN');
+	}
+
 	if (app && ep.meta.kind) {
 		if (!app.permission.some(p => p === ep.meta.kind)) {
 			return rej('PERMISSION_DENIED');
@ -53,7 +57,7 @@ export default (endpoint: string, user: IUser, app: IApp, data: any, file?: any)
 		const time = after - before;

 		if (time > 1000) {
-			console.warn(`SLOW API CALL DETECTED: ${ep.name} (${ time }ms)`);
+			console.warn(`SLOW API CALL DETECTED: ${ep.name} (${time}ms)`);
 		}
 	} catch (e) {
 		rej(e);
--- a/src/server/api/endpoints.ts
+++ b/src/server/api/endpoints.ts
@ -14,6 +14,11 @@ export interface IEndpointMeta {
 	 */
 	requireCredential?: boolean;

+	/**
+	 * 管理者のみ使えるエンドポイントか否か
+	 */
+	requireAdmin?: boolean;
+
 	/**
 	 * エンドポイントのリミテーションに関するやつ
 	 * 省略した場合はリミテーションは無いものとして解釈されます。
--- a/src/server/api/endpoints/admin/suspend-user.ts
+++ b/src/server/api/endpoints/admin/suspend-user.ts
@ -0,0 +1,46 @@
+import $ from 'cafy';
+import ID from '../../../../misc/cafy-id';
+import getParams from '../../get-params';
+import User from '../../../../models/user';
+
+export const meta = {
+  desc: {
+    ja: '指定したユーザーを凍結します。',
+    en: 'Suspend a user.'
+  },
+
+  requireCredential: true,
+  requireAdmin: true,
+
+  params: {
+    userId: $.type(ID).note({
+      desc: {
+        ja: '対象のユーザーID',
+        en: 'The user ID which you want to suspend'
+      }
+    }),
+  }
+};
+
+export default (params: any) => new Promise(async (res, rej) => {
+  const [ps, psErr] = getParams(meta, params);
+  if (psErr) return rej(psErr);
+
+  const user = await User.findOne({
+    _id: ps.userId
+  });
+
+  if (user == null) {
+    return rej('user not found');
+  }
+
+  await User.findOneAndUpdate({
+    _id: user._id
+  }, {
+      $set: {
+        isSuspended: true
+      }
+    });
+
+  res();
+});
--- a/src/server/api/endpoints/admin/unsuspend-user.ts
+++ b/src/server/api/endpoints/admin/unsuspend-user.ts
@ -0,0 +1,46 @@
+import $ from 'cafy';
+import ID from '../../../../misc/cafy-id';
+import getParams from '../../get-params';
+import User from '../../../../models/user';
+
+export const meta = {
+	desc: {
+		ja: '指定したユーザーの凍結を解除します。',
+		en: 'Unsuspend a user.'
+	},
+
+	requireCredential: true,
+	requireAdmin: true,
+
+	params: {
+		userId: $.type(ID).note({
+			desc: {
+				ja: '対象のユーザーID',
+				en: 'The user ID which you want to unsuspend'
+			}
+		}),
+	}
+};
+
+export default (params: any) => new Promise(async (res, rej) => {
+	const [ps, psErr] = getParams(meta, params);
+	if (psErr) return rej(psErr);
+
+	const user = await User.findOne({
+		_id: ps.userId
+	});
+
+	if (user == null) {
+		return rej('user not found');
+	}
+
+	await User.findOneAndUpdate({
+		_id: user._id
+	}, {
+			$set: {
+				isSuspended: false
+			}
+		});
+
+	res();
+});
--- a/src/server/api/endpoints/app/create.ts
+++ b/src/server/api/endpoints/app/create.ts
@ -4,7 +4,7 @@ import App, { isValidNameId, pack } from '../../../../models/app';
 import { ILocalUser } from '../../../../models/user';

 export const meta = {
-	requireCredential: true
+	requireCredential: false
 };

 /**
@ -38,7 +38,7 @@ export default async (params: any, user: ILocalUser) => new Promise(async (res,
 	// Create account
 	const app = await App.insert({
 		createdAt: new Date(),
-		userId: user._id,
+		userId: user && user._id,
 		name: name,
 		nameId: nameId,
 		nameIdLower: nameId.toLowerCase(),
--- a/src/server/api/endpoints/messaging/history.ts
+++ b/src/server/api/endpoints/messaging/history.ts
@ -40,6 +40,5 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
 		});

 	// Serialize
-	res(await Promise.all(history.map(async h =>
-		await pack(h.messageId, user))));
+	res(await Promise.all(history.map(h => pack(h.messageId, user))));
 });
--- a/src/server/api/endpoints/messaging/messages/read.ts
+++ b/src/server/api/endpoints/messaging/messages/read.ts
@ -0,0 +1,43 @@
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
+import Message from '../../../../../models/messaging-message';
+import { ILocalUser } from '../../../../../models/user';
+import read from '../../../common/read-messaging-message';
+import getParams from '../../../get-params';
+
+export const meta = {
+	desc: {
+		ja: '指定した自分宛てのメッセージを既読にします。',
+		en: 'Mark as read a message of messaging.'
+	},
+
+	requireCredential: true,
+
+	kind: 'messaging-write',
+
+	params: {
+		messageId: $.type(ID).note({
+			desc: {
+				ja: '既読にするメッセージのID',
+				en: 'The ID of a message that you want to mark as read'
+			}
+		})
+	}
+};
+
+export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
+	const [ps, psErr] = getParams(meta, params);
+	if (psErr) throw psErr;
+
+	const message = await Message.findOne({
+		_id: ps.messageId,
+		recipientId: user._id
+	});
+
+	if (message == null) {
+		return rej('message not found');
+	}
+
+	read(user._id, message.userId, message);
+
+	res();
+});
--- a/src/server/api/endpoints/notes/timeline.ts
+++ b/src/server/api/endpoints/notes/timeline.ts
@ -8,7 +8,8 @@ import getParams from '../../get-params';

 export const meta = {
 	desc: {
-		ja: 'タイムラインを取得します。'
+		ja: 'タイムラインを取得します。',
+		en: 'Get timeline of myself.'
 	},

 	requireCredential: true,
@ -67,9 +68,6 @@ export const meta = {
 	}
 };

-/**
- * Get timeline of myself
- */
 export default async (params: any, user: ILocalUser) => {
 	const [ps, psErr] = getParams(meta, params);
 	if (psErr) throw psErr;
--- a/src/server/file/send-drive-file.ts
+++ b/src/server/file/send-drive-file.ts
@ -1,5 +1,3 @@
-import * as fs from 'fs';
-
 import * as Koa from 'koa';
 import * as send from 'koa-send';
 import * as mongodb from 'mongodb';
@ -51,16 +49,10 @@ export default async function(ctx: Koa.Context) {
 	};

 	if ('thumbnail' in ctx.query) {
-		// 画像以外
-		if (!file.contentType.startsWith('image/')) {
-			const readable = fs.createReadStream(`${__dirname}/assets/thumbnail-not-available.png`);
-			ctx.set('Content-Type', 'image/png');
-			ctx.body = readable;
-		} else if (file.contentType == 'image/gif') {
-			// GIF
-			await sendRaw();
-		} else {
-			const thumb = await DriveFileThumbnail.findOne({ 'metadata.originalId': fileId });
+		const thumb = await DriveFileThumbnail.findOne({
+			'metadata.originalId': fileId
+		});
+
 		if (thumb != null) {
 			ctx.set('Content-Type', 'image/jpeg');
 			const bucket = await getDriveFileThumbnailBucket();
@ -68,7 +60,6 @@ export default async function(ctx: Koa.Context) {
 		} else {
 			await sendRaw();
 		}
-		}
 	} else {
 		if ('download' in ctx.query) {
 			ctx.set('Content-Disposition', 'attachment');
--- a/src/server/web/url-preview.ts
+++ b/src/server/web/url-preview.ts
@ -14,7 +14,9 @@ module.exports = async (ctx: Koa.Context) => {

 		ctx.body = summary;
 	} catch (e) {
-		ctx.status = 500;
+		ctx.status = 200;
+		ctx.set('Cache-Control', 'max-age=86400, immutable');
+		ctx.body = '{}';
 	}
 };

--- a/src/services/drive/add-file.ts
+++ b/src/services/drive/add-file.ts
@ -1,6 +1,5 @@
 import { Buffer } from 'buffer';
 import * as fs from 'fs';
-import * as stream from 'stream';

 import * as mongodb from 'mongodb';
 import * as crypto from 'crypto';
@ -17,30 +16,52 @@ import { publishUserStream, publishDriveStream } from '../../stream';
 import { isLocalUser, IUser, IRemoteUser } from '../../models/user';
 import delFile from './delete-file';
 import config from '../../config';
+import { getDriveFileThumbnailBucket } from '../../models/drive-file-thumbnail';

 const log = debug('misskey:drive:add-file');

-async function save(readable: stream.Readable, name: string, type: string, hash: string, size: number, metadata: any): Promise<IDriveFile> {
+async function save(path: string, name: string, type: string, hash: string, size: number, metadata: any): Promise<IDriveFile> {
+	let thumbnail: Buffer;
+
+	if (['image/jpeg', 'image/png', 'image/webp'].includes(type)) {
+		thumbnail = await sharp(path)
+			.resize(300)
+			.jpeg({
+				quality: 50,
+				progressive: true
+			})
+			.toBuffer();
+	}
+
 	if (config.drive && config.drive.storage == 'minio') {
 		const minio = new Minio.Client(config.drive.config);
 		const id = uuid.v4();
 		const obj = `${config.drive.prefix}/${id}`;
+		const thumbnailObj = `${obj}-thumbnail`;

 		const baseUrl = config.drive.baseUrl
 			|| `${ config.drive.config.secure ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? ':' + config.drive.config.port : '' }/${ config.drive.bucket }`;

-		await minio.putObject(config.drive.bucket, obj, readable, size, {
+		await minio.putObject(config.drive.bucket, obj, fs.createReadStream(path), size, {
 			'Content-Type': type,
 			'Cache-Control': 'max-age=31536000, immutable'
 		});

+		if (thumbnail) {
+			await minio.putObject(config.drive.bucket, thumbnailObj, fs.createReadStream(path), size, {
+				'Content-Type': 'image/jpeg',
+				'Cache-Control': 'max-age=31536000, immutable'
+			});
+		}
+
 		Object.assign(metadata, {
 			withoutChunks: true,
 			storage: 'minio',
 			storageProps: {
 				id: id
 			},
-			url: `${ baseUrl }/${ obj }`
+			url: `${ baseUrl }/${ obj }`,
+			thumbnailUrl: thumbnail ? `${ baseUrl }/${ thumbnailObj }` : null
 		});

 		const file = await DriveFile.insert({
@ -57,12 +78,36 @@ async function save(readable: stream.Readable, name: string, type: string, hash:
 		// Get MongoDB GridFS bucket
 		const bucket = await getDriveFileBucket();

-		return new Promise<IDriveFile>((resolve, reject) => {
-			const writeStream = bucket.openUploadStream(name, { contentType: type, metadata });
+		const file = await new Promise<IDriveFile>((resolve, reject) => {
+			const writeStream = bucket.openUploadStream(name, {
+				contentType: type,
+				metadata
+			});
+
 			writeStream.once('finish', resolve);
 			writeStream.on('error', reject);
-			readable.pipe(writeStream);
+
+			fs.createReadStream(path).pipe(writeStream);
 		});
+
+		if (thumbnail) {
+			const thumbnailBucket = await getDriveFileThumbnailBucket();
+
+			await new Promise<IDriveFile>((resolve, reject) => {
+				const writeStream = thumbnailBucket.openUploadStream(name, {
+					contentType: 'image/jpeg',
+					metadata: {
+						originalId: file._id
+					}
+				});
+
+				writeStream.once('finish', resolve);
+				writeStream.on('error', reject);
+				writeStream.end(thumbnail);
+			});
+		}
+
+		return file;
 	}
 }

@ -321,7 +366,7 @@ export default async function(
 			}
 		}
 	} else {
-		driveFile = await (save(fs.createReadStream(path), detectedName, mime, hash, size, metadata));
+		driveFile = await (save(path, detectedName, mime, hash, size, metadata));
 	}

 	log(`drive file has been created ${driveFile._id}`);
--- a/src/services/drive/delete-file.ts
+++ b/src/services/drive/delete-file.ts
@ -6,8 +6,14 @@ import config from '../../config';
 export default async function(file: IDriveFile, isExpired = false) {
 	if (file.metadata.storage == 'minio') {
 		const minio = new Minio.Client(config.drive.config);
+
 		const obj = `${config.drive.prefix}/${file.metadata.storageProps.id}`;
 		await minio.removeObject(config.drive.bucket, obj);
+
+		if (file.metadata.thumbnailUrl) {
+			const thumbnailObj = `${config.drive.prefix}/${file.metadata.storageProps.id}-thumbnail`;
+			await minio.removeObject(config.drive.bucket, thumbnailObj);
+		}
 	}

 	// チャンクをすべて削除
--- a/src/services/note/create.ts
+++ b/src/services/note/create.ts
@ -95,6 +95,8 @@ type Option = {
 };

 export default async (user: IUser, data: Option, silent = false) => new Promise<INote>(async (res, rej) => {
+	const isFirstNote = user.notesCount === 0;
+
 	if (data.createdAt == null) data.createdAt = new Date();
 	if (data.visibility == null) data.visibility = 'public';
 	if (data.viaMobile == null) data.viaMobile = false;
@ -164,6 +166,10 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
 	// Pack the note
 	const noteObj = await pack(note);

+	if (isFirstNote) {
+		noteObj.isFirstNote = true;
+	}
+
 	const nm = new NotificationManager(user, note);
 	const nmRelatedPromises = [];

@ -188,6 +194,7 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
 		// 通知
 		if (isLocalUser(data.reply._user)) {
 			nm.push(data.reply.userId, 'reply');
+			publishUserStream(data.reply.userId, 'reply', noteObj);
 		}
 	}

@ -209,7 +216,7 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
 		}

 		// Publish event
-		if (!user._id.equals(data.renote.userId)) {
+		if (!user._id.equals(data.renote.userId) && isLocalUser(data.renote._user)) {
 			publishUserStream(data.renote.userId, 'renote', noteObj);
 		}
 	}
--- a/webpack.config.ts
+++ b/webpack.config.ts
@ -95,7 +95,8 @@ const consts = {
 	_URL_: config.url,
 	_LICENSE_: licenseHtml,
 	_GOOGLE_MAPS_API_KEY_: config.google_maps_api_key,
-	_WELCOME_BG_URL_: config.welcome_bg_url
+	_WELCOME_BG_URL_: config.welcome_bg_url,
+	_TWITTER_INTEGRATION_: config.twitter != null
 };

 const _consts: { [ key: string ]: any } = {};
Author	SHA1	Message	Date
syuilo	1fc9206c6d	6.0.0	2018-08-16 08:02:50 +09:00
syuilo	a8fb0d477f	Merge pull request #2251 from syuilo/provide-thumbnails Provide drive file thumbnails	2018-08-16 07:59:16 +09:00
syuilo	0c372b68d4	Merge pull request #2252 from syuilo/greenkeeper/minio-7.0.0 Update minio to the latest version 🚀	2018-08-16 07:58:56 +09:00
syuilo	e7d9018944	✌️	2018-08-16 07:56:53 +09:00
syuilo	ce16884587	Update example.yml	2018-08-16 07:31:58 +09:00
greenkeeper[bot]	3345733d00	fix(package): update minio to version 7.0.0	2018-08-15 22:26:17 +00:00
greenkeeper[bot]	f91cccb6b1	fix(package): update @types/webpack to version 4.4.10	2018-08-16 07:24:19 +09:00
syuilo	6183262037	wip	2018-08-16 07:17:04 +09:00
syuilo	1c7a194950	wip	2018-08-16 06:27:35 +09:00
greenkeeper[bot]	286e15b967	fix(package): update @types/node to version 10.7.1	2018-08-16 06:08:15 +09:00
syuilo	744d366874	Merge pull request #2248 from syuilo/new-kao Add new kao	2018-08-16 05:17:56 +09:00
Aya Morisawa	afa62d3d44	Add new kao	2018-08-16 05:17:00 +09:00
Aya Morisawa	270c7997c6	Remove trailing comma	2018-08-16 05:15:51 +09:00
Aya Morisawa	fa95641f88	Use Array.prototype.length to avoid magic number	2018-08-16 05:15:06 +09:00
syuilo	aa9fe38c25	Merge pull request #2247 from syuilo/clickable-reaction Make reactions in reactions-viewer clickable	2018-08-16 05:00:13 +09:00
Aya Morisawa	0d33cbbbbb	Make reactions in reactions-viewer clickable	2018-08-16 04:57:09 +09:00
syuilo	bf077da72f	Trim code	2018-08-16 04:42:44 +09:00
syuilo	d8f8e19d06	Merge pull request #2246 from mei23/mei-0816-player 動画プレーヤーの修正	2018-08-16 03:17:41 +09:00
mei23	3c3d3e4c0c	Fix url-preview.vue	2018-08-16 03:06:59 +09:00
syuilo	0efbeb36df	5.25.0	2018-08-16 01:29:11 +09:00
syuilo	73c396cb39	⭐	2018-08-16 01:25:35 +09:00
syuilo	8e75f8a125	Fix	2018-08-16 01:20:52 +09:00
syuilo	e8a7e95c65	Update summaly	2018-08-16 01:17:01 +09:00
syuilo	70a6889fe5	Merge branch 'master' of https://github.com/syuilo/misskey	2018-08-16 00:59:54 +09:00
syuilo	6aff7375f6	Update backers	2018-08-16 00:59:48 +09:00
Aya Morisawa	d2ef95a8c3	Make text unclickable	2018-08-16 00:49:40 +09:00
syuilo	1ae51df74a	Update .travis.yml	2018-08-16 00:42:20 +09:00
syuilo	3098c6a915	Merge pull request #2242 from syuilo/l10n_master New Crowdin translations	2018-08-16 00:16:31 +09:00
Aya Morisawa	ab3f8fd10c	Enhance log message	2018-08-16 00:13:24 +09:00
Aya Morisawa	4bdef3720c	Update setup.en.md	2018-08-15 23:55:30 +09:00
syuilo	c02cecc9e5	New translations ja.yml (English)	2018-08-15 23:30:49 +09:00
syuilo	08b431723a	Refactoring	2018-08-15 20:27:49 +09:00
syuilo	83dcfec053	Improve MFM	2018-08-15 20:27:36 +09:00
syuilo	69ac7b739f	Improve MFM	2018-08-15 20:23:50 +09:00
syuilo	9ccf9a2496	Fix #2229	2018-08-15 20:20:46 +09:00
syuilo	78563ef9a0	Fix #2228	2018-08-15 20:09:56 +09:00
syuilo	019d157b92	Merge pull request #2198 from syuilo/l10n_master New Crowdin translations	2018-08-15 19:48:03 +09:00
syuilo	14de35e3f5	Merge pull request #2234 from acid-chicken/patch-player Update player whitelist	2018-08-15 19:04:31 +09:00
Acid Chicken (硫酸鶏)	a860479e88	Update url-preview.vue	2018-08-15 19:00:44 +09:00
Acid Chicken (硫酸鶏)	b351b3fae5	Update url-preview.vue	2018-08-15 18:49:05 +09:00
syuilo	89918a9f79	New translations ja.yml (English)	2018-08-15 17:08:24 +09:00
syuilo	cadd020915	New translations ja.yml (English)	2018-08-15 16:51:16 +09:00
syuilo	e80933b8ae	New translations ja.yml (English)	2018-08-15 16:40:52 +09:00
syuilo	4c0832884f	New translations ja.yml (English)	2018-08-15 16:30:48 +09:00
syuilo	e4ca940979	New translations ja.yml (English)	2018-08-15 16:20:51 +09:00
syuilo	3fd9be3967	New translations ja.yml (English)	2018-08-15 16:13:11 +09:00
syuilo	79ec7aba1d	New translations ja.yml (English)	2018-08-15 13:40:56 +09:00
syuilo	42b1f7eddd	New translations ja.yml (English)	2018-08-15 11:30:56 +09:00
syuilo	889a73caa4	New translations ja.yml (Catalan)	2018-08-15 11:11:41 +09:00
syuilo	c34a89e962	New translations ja.yml (Portuguese)	2018-08-15 11:11:39 +09:00
syuilo	2b4bf681e5	New translations ja.yml (Korean)	2018-08-15 11:11:36 +09:00
syuilo	d1d59e3557	New translations ja.yml (Polish)	2018-08-15 11:11:34 +09:00
syuilo	668c21830c	New translations ja.yml (Chinese Simplified)	2018-08-15 11:11:31 +09:00
syuilo	7c37ed07f8	New translations ja.yml (Italian)	2018-08-15 11:11:29 +09:00
syuilo	a135d8fd59	New translations ja.yml (Russian)	2018-08-15 11:11:27 +09:00
syuilo	0db9aae162	New translations ja.yml (English)	2018-08-15 11:11:25 +09:00
syuilo	1875c362af	New translations ja.yml (Spanish)	2018-08-15 11:11:23 +09:00
syuilo	9b36dd9565	New translations ja.yml (German)	2018-08-15 11:11:21 +09:00
syuilo	69452a27de	New translations ja.yml (French)	2018-08-15 11:11:18 +09:00
syuilo	6aa5c5895f	Merge pull request #2219 from syuilo/patch-2215 Resolve #2215	2018-08-15 11:07:07 +09:00
syuilo	12f20c67b1	New translations ja.yml (English)	2018-08-15 09:21:05 +09:00
syuilo	66b8e5647d	New translations ja.yml (English)	2018-08-15 09:11:16 +09:00
syuilo	188a23fec7	New translations ja.yml (English)	2018-08-15 09:01:12 +09:00
syuilo	b408b45000	New translations ja.yml (English)	2018-08-15 08:55:29 +09:00
Aya Morisawa	c53cb94250	Resolve #2215	2018-08-15 06:50:49 +09:00
syuilo	ba2eeabe38	Merge pull request #2216 from syuilo/patch-2201 Resolve #2201	2018-08-15 04:46:52 +09:00
Aya Morisawa	259fac224e	Resolve #2201	2018-08-15 04:44:39 +09:00
syuilo	aad5440c9e	New translations ja.yml (English)	2018-08-15 04:41:14 +09:00
syuilo	5c40f0010f	New translations ja.yml (English)	2018-08-15 04:31:06 +09:00
syuilo	fb1d181424	New translations ja.yml (English)	2018-08-15 04:21:29 +09:00
syuilo	12cbd8ef5b	New translations ja.yml (English)	2018-08-15 04:11:22 +09:00
syuilo	cfc4385d1f	New translations ja.yml (English)	2018-08-15 04:00:59 +09:00
syuilo	880ef024d0	New translations ja.yml (English)	2018-08-15 03:51:09 +09:00
syuilo	c6c6edbc0a	New translations ja.yml (English)	2018-08-15 03:41:21 +09:00
syuilo	83ba951bf9	5.24.1	2018-08-15 02:38:47 +09:00
syuilo	9c22b1a68a	Fix	2018-08-15 02:35:25 +09:00
syuilo	cd6a1d3446	5.24.0	2018-08-15 02:14:57 +09:00
syuilo	4a9fc0c8ed	Better query	2018-08-15 02:08:18 +09:00
syuilo	fada899b30	Merge pull request #2210 from mei23/mei-0814-ap3 ActivityPub Followers/Following/Outbox の実装	2018-08-15 02:04:08 +09:00
syuilo	22b099fa8a	Merge branch 'master' of https://github.com/syuilo/misskey	2018-08-15 02:01:52 +09:00
syuilo	e0bc0d2830	Add new kao	2018-08-15 02:01:49 +09:00
greenkeeper[bot]	90768d30aa	fix(package): update seedrandom to version 2.4.4	2018-08-15 01:53:48 +09:00
greenkeeper[bot]	177c549493	fix(package): update url-loader to version 1.1.0	2018-08-15 01:53:40 +09:00
syuilo	5e1ee68189	Merge branch 'master' of https://github.com/syuilo/misskey	2018-08-15 01:51:46 +09:00
syuilo	175f6303bc	Update theme color	2018-08-15 01:51:43 +09:00
syuilo	cf9f2a5562	Merge pull request #2211 from skid9000/patch-2 Update doc for twitter integration.	2018-08-14 22:55:02 +09:00
Skid	f04526baca	Update example.yml	2018-08-14 15:45:36 +02:00
Skid	f085ecedb3	Update setup.en.md	2018-08-14 15:41:55 +02:00
mei23	0986301788	Implement ActivityPub Followers/Following/Outbox	2018-08-14 20:13:32 +09:00
greenkeeper[bot]	fe418d8d9a	fix(package): update @types/ws to version 6.0.0	2018-08-14 17:07:35 +09:00
greenkeeper[bot]	6009be34dc	fix(package): update @types/node to version 10.7.0	2018-08-14 17:07:23 +09:00
greenkeeper[bot]	01a0a54a2c	fix(package): update @types/mongodb to version 3.1.4	2018-08-14 17:07:15 +09:00
greenkeeper[bot]	cfcaf77e21	fix(package): update mongodb to version 3.1.3	2018-08-14 17:07:07 +09:00
greenkeeper[bot]	3b37bdc0b9	fix(package): update vue-style-loader to version 4.1.2	2018-08-14 17:06:54 +09:00
syuilo	ec07112f94	Fix bug	2018-08-14 16:53:57 +09:00
syuilo	464faf2673	Merge pull request #2200 from syuilo/use-deque Use deque instead of linked list	2018-08-14 08:22:23 +09:00
Aya Morisawa	bde20a1a65	Use deque instead of linked list	2018-08-14 08:21:25 +09:00
syuilo	86c7276da9	Merge branch 'master' of https://github.com/syuilo/misskey	2018-08-14 08:16:24 +09:00
syuilo	fec988bb79	Provide isFirstNote flag	2018-08-14 08:16:21 +09:00
syuilo	0702d0974b	Merge pull request #2199 from syuilo/patch-2176 Resolve #2176	2018-08-14 07:51:45 +09:00
Aya Morisawa	f443d36dbb	Resolve #2176	2018-08-14 07:49:59 +09:00
syuilo	5477f0a865	New translations ja.yml (English)	2018-08-14 05:42:07 +09:00
Aya Morisawa	dc02168f33	Merge #2182	2018-08-14 05:25:02 +09:00
Aya Morisawa	cc5c32b4d2	Clean up	2018-08-14 05:24:51 +09:00
syuilo	a35680a838	New translations ja.yml (Catalan)	2018-08-14 04:52:05 +09:00
syuilo	770cba73a6	New translations ja.yml (Portuguese)	2018-08-14 04:52:03 +09:00
syuilo	401fc758fd	New translations ja.yml (Korean)	2018-08-14 04:52:01 +09:00
syuilo	e8503e6351	New translations ja.yml (Polish)	2018-08-14 04:51:58 +09:00
syuilo	de23753409	New translations ja.yml (Chinese Simplified)	2018-08-14 04:51:56 +09:00
syuilo	4857d86cdd	New translations ja.yml (Italian)	2018-08-14 04:51:54 +09:00
syuilo	dc4a072678	New translations ja.yml (Russian)	2018-08-14 04:51:52 +09:00
syuilo	c6ee5ccd88	New translations ja.yml (English)	2018-08-14 04:51:50 +09:00
syuilo	68b630cb37	New translations ja.yml (Spanish)	2018-08-14 04:51:48 +09:00
syuilo	94c0238d3a	New translations ja.yml (German)	2018-08-14 04:51:45 +09:00
syuilo	dbea387433	New translations ja.yml (French)	2018-08-14 04:51:43 +09:00
syuilo	d35f62d0e4	Merge pull request #2195 from syuilo/instance-management-system 管理画面	2018-08-14 04:42:16 +09:00
Aya Morisawa	09b8e81a77	wip	2018-08-14 04:39:37 +09:00
Aya Morisawa	3b38979a34	wip	2018-08-14 04:30:42 +09:00
greenkeeper[bot]	0fd8c86c24	fix(package): update mongodb to version 3.1.2	2018-08-14 03:38:01 +09:00
syuilo	58d0ed1a2e	5.23.2	2018-08-14 02:36:06 +09:00
syuilo	8939452036	Merge pull request #2192 from acid-chicken/acid-chicken-patch-3 Re: Re: Fix #2177	2018-08-14 02:31:00 +09:00
Acid Chicken (硫酸鶏)	a2931d6f7e	Update ui.header.vue	2018-08-14 02:26:58 +09:00
Acid Chicken (硫酸鶏)	38b75ad977	Update avatar.vue	2018-08-14 02:10:06 +09:00
syuilo	dc4f585954	Merge pull request #2191 from syuilo/greenkeeper/parse5-5.1.0 Update parse5 to the latest version 🚀	2018-08-14 01:58:01 +09:00
syuilo	1fbe5365f7	Update example.yml	2018-08-14 01:57:52 +09:00
greenkeeper[bot]	04257db938	fix(package): update parse5 to version 5.1.0	2018-08-13 16:54:58 +00:00
Aya Morisawa	ba08d1aa53	wip	2018-08-14 01:48:11 +09:00
syuilo	c29cb5bfb9	Update package.json	2018-08-14 01:38:29 +09:00
Aya Morisawa	fb1e2efbdd	wip	2018-08-14 01:37:23 +09:00
syuilo	131a454e7c	Merge pull request #2190 from mei23/mei-apsendvis2 ActivityPub送信時の公開範囲の実装	2018-08-14 01:36:56 +09:00
Aya Morisawa	92e5cff285	wip	2018-08-14 01:35:36 +09:00
syuilo	b24e32e14e	5.23.0	2018-08-14 01:32:49 +09:00
syuilo	943805bdcd	Merge pull request #2180 from syuilo/l10n_master New Crowdin translations	2018-08-14 01:32:11 +09:00
Aya Morisawa	ba9340a26b	wip	2018-08-14 01:24:46 +09:00
Aya Morisawa	00119328f2	wip	2018-08-14 01:19:05 +09:00
syuilo	a73c65da07	New translations ja.yml (French)	2018-08-14 01:11:32 +09:00
syuilo	9021bb5694	wip	2018-08-14 01:05:58 +09:00
syuilo	a3cf63823f	Merge pull request #2189 from syuilo/patch-1 Hide unimplemented button	2018-08-13 23:53:15 +09:00
Acid Chicken (硫酸鶏)	f15878cc6f	Update avatar.vue refs: https://github.com/syuilo/misskey/pull/2182#discussion_r209609541	2018-08-13 22:49:32 +09:00
Aya Morisawa	33469ff87a	Hide Unimplemented button	2018-08-13 22:08:59 +09:00
syuilo	23b0723168	Merge pull request #2188 from Tosuke/patch1 Create apps without authentication(#2025)	2018-08-13 12:38:02 +09:00
Tosuke	fda1ab3e05	Create apps without authentication(#2025 )	2018-08-13 12:30:32 +09:00
syuilo	490c05a869	New translations ja.yml (English)	2018-08-13 06:32:08 +09:00
syuilo	f0137daebe	New translations ja.yml (English)	2018-08-13 04:51:11 +09:00
syuilo	b9fc0e6d71	Merge pull request #2183 from acid-chicken/patch-1 Make player height taller	2018-08-13 04:42:49 +09:00
Acid Chicken (硫酸鶏)	979efee412	Update url-preview.vue	2018-08-13 04:41:12 +09:00
mei23	f079041827	ActivityPub visibility on send	2018-08-13 03:49:17 +09:00
Acid Chicken (硫酸鶏)	4edd9efc0b	Update avatar.vue refs: https://github.com/syuilo/misskey/pull/2182#discussion_r209464350	2018-08-13 03:47:56 +09:00
Acid Chicken (硫酸鶏)	2913c7ccfb	Update avatar.vue	2018-08-13 03:42:12 +09:00
Acid Chicken (硫酸鶏)	e1f460f90f	Update user.header.vue	2018-08-13 03:40:50 +09:00
Acid Chicken (硫酸鶏)	70f927ea43	Update avatar.vue	2018-08-13 03:39:32 +09:00
Acid Chicken (硫酸鶏)	80d343bb0b	Update avatar.vue	2018-08-13 03:36:42 +09:00
syuilo	9e41fddea3	Merge pull request #2130 from acid-chicken/patch-player WIP: Add player	2018-08-13 03:25:22 +09:00
Acid Chicken (硫酸鶏)	8384efc8c7	Create whitelist	2018-08-13 03:23:36 +09:00
syuilo	7797c86581	Merge pull request #2181 from acid-chicken/patch-1 Re: Fix #2177	2018-08-13 01:59:11 +09:00
Acid Chicken (硫酸鶏)	4da8cc478f	Update ui.header.vue	2018-08-13 01:58:15 +09:00
syuilo	285deeec52	New translations ja.yml (Catalan)	2018-08-13 01:31:20 +09:00
syuilo	2916e49422	New translations ja.yml (Portuguese)	2018-08-13 01:31:18 +09:00
syuilo	41e5b9134b	New translations ja.yml (Korean)	2018-08-13 01:31:16 +09:00
syuilo	d0d853dcb2	New translations ja.yml (Polish)	2018-08-13 01:31:13 +09:00
syuilo	be46c7e4c5	New translations ja.yml (Chinese Simplified)	2018-08-13 01:31:11 +09:00
syuilo	8e0f41d608	New translations ja.yml (Italian)	2018-08-13 01:31:09 +09:00
syuilo	a7b438072c	New translations ja.yml (Russian)	2018-08-13 01:31:06 +09:00
syuilo	99958e2fce	New translations ja.yml (English)	2018-08-13 01:31:04 +09:00
syuilo	b82843d359	New translations ja.yml (Spanish)	2018-08-13 01:31:02 +09:00
syuilo	4dfc2dfa89	New translations ja.yml (German)	2018-08-13 01:30:59 +09:00
syuilo	50c945607f	New translations ja.yml (French)	2018-08-13 01:30:57 +09:00
syuilo	01f28b21dd	#1211	2018-08-13 01:25:50 +09:00
syuilo	2cb39a8882	Fix #2097	2018-08-13 00:59:36 +09:00
Aya Morisawa	6ddb6bc160	Add .vsls.json	2018-08-13 00:24:45 +09:00
Acid Chicken (硫酸鶏)	92befbb4cc	Fix #2177 Resolves #2177	2018-08-13 00:18:02 +09:00
syuilo	ab701bb93e	Merge pull request #2159 from syuilo/l10n_master New Crowdin translations	2018-08-12 23:53:22 +09:00
greenkeeper[bot]	7f9a88fd1c	fix(package): update vue-js-modal to version 1.3.17	2018-08-12 23:13:52 +09:00
mei23	c5073b33ef	Fix ActivityPub followers/specified detection	2018-08-12 20:37:35 +09:00
greenkeeper[bot]	765b922a8b	fix(package): update ts-node to version 7.0.1	2018-08-12 16:22:43 +09:00
syuilo	9b7d6274fa	New translations ja.yml (French)	2018-08-12 07:40:57 +09:00
syuilo	26b384aef1	New translations ja.yml (French)	2018-08-12 07:30:58 +09:00
syuilo	0b1e5e3e08	New translations ja.yml (French)	2018-08-12 07:20:58 +09:00
syuilo	5b7506756e	New translations ja.yml (French)	2018-08-12 07:11:02 +09:00
Aya Morisawa	1f28a0dfeb	Improve nya	2018-08-12 05:20:31 +09:00
mei23	f56ec82f6b	Fix ActivityPub attachment url	2018-08-12 04:42:14 +09:00
syuilo	8ccbabf5ca	5.22.1	2018-08-12 03:09:45 +09:00
syuilo	7c763600b7	Fix #2162	2018-08-12 03:09:22 +09:00
syuilo	499491003b	New translations ja.yml (Polish)	2018-08-12 00:31:30 +09:00
Aya Morisawa	3a77d871d5	Stop supporting docker	2018-08-12 00:30:58 +09:00
Aya Morisawa	4ee6d0b549	Refactoring (#2160 )	2018-08-12 00:01:07 +09:00
syuilo	64aa733b16	New translations ja.yml (Polish)	2018-08-11 22:51:08 +09:00
syuilo	c8c4ec6ad4	5.22.0	2018-08-11 21:35:22 +09:00
syuilo	c9ee737078	Fix bug	2018-08-11 21:34:12 +09:00
syuilo	ebc2cca0b4	New Crowdin translations (#2158 )	2018-08-11 21:29:07 +09:00
syuilo	fc94df06eb	New Crowdin translations (#2157 )	2018-08-11 21:13:38 +09:00
syuilo	190a03103e	New translations ja.yml (Catalan)	2018-08-11 21:11:31 +09:00
syuilo	0d75ae9d9a	New translations ja.yml (Portuguese)	2018-08-11 21:11:29 +09:00
syuilo	3129f8f073	New translations ja.yml (Korean)	2018-08-11 21:11:27 +09:00
syuilo	7f751d3f20	New translations ja.yml (Polish)	2018-08-11 21:11:25 +09:00
syuilo	0b5b834f8b	New translations ja.yml (Chinese Simplified)	2018-08-11 21:11:23 +09:00
syuilo	0f649f7d37	New translations ja.yml (Italian)	2018-08-11 21:11:21 +09:00
syuilo	a1b100d412	New translations ja.yml (Russian)	2018-08-11 21:11:19 +09:00
syuilo	dd4ee1627e	New translations ja.yml (English)	2018-08-11 21:11:16 +09:00
syuilo	1da0fdcf78	New translations ja.yml (Spanish)	2018-08-11 21:11:14 +09:00
syuilo	800eec73b8	New translations ja.yml (German)	2018-08-11 21:11:12 +09:00
syuilo	166cb5e179	New translations ja.yml (French)	2018-08-11 21:11:10 +09:00
syuilo	4a5e145048	Add new reaction: rip 😇	2018-08-11 21:08:34 +09:00
syuilo	be68f42220	Implement messaging/messages/read	2018-08-11 21:01:39 +09:00
syuilo	7942aa677f	Update doc	2018-08-11 21:01:26 +09:00
syuilo	2fcf9288a5	Refactoring	2018-08-11 20:53:03 +09:00
MeiMei	9bc17974f2	未利用時はTwitterでログインを表示しない (#2156 )	2018-08-11 20:20:35 +09:00
Acid Chicken (硫酸鶏)	19c872a1f3	Update url-preview.vue	2018-08-11 19:56:53 +09:00
Acid Chicken (硫酸鶏)	9252c59d90	Merge branch 'master' into patch-player	2018-08-11 19:56:05 +09:00
MeiMei	a8f142096c	Cache failed url-preview (apply to proxy/client) (#2154 )	2018-08-11 18:04:59 +09:00
syuilo	0b154ac7ba	Merge branch 'master' into l10n_master	2018-08-11 12:21:06 +09:00
syuilo	d4eb0c8df9	New translations ja.yml (Spanish)	2018-08-11 01:42:11 +09:00
syuilo	5ba6f20701	New translations ja.yml (Spanish)	2018-08-11 01:31:44 +09:00
syuilo	695a082582	New translations ja.yml (Spanish)	2018-08-11 01:21:58 +09:00
Acid Chicken (硫酸鶏)	1b9f293959	Update url-preview.vue 多分もう折り返す必要はないのだわ	2018-08-09 23:34:54 +09:00
Acid Chicken (硫酸鶏)	7289d5b401	Add player	2018-08-09 16:44:34 +09:00
syuilo	5bdbf98f8c	New translations ja.yml (English)	2018-08-09 04:21:24 +09:00
syuilo	4e915e96a5	New translations ja.yml (French)	2018-08-09 02:52:24 +09:00
syuilo	e148f6ce5e	New translations ja.yml (French)	2018-08-09 02:41:44 +09:00
syuilo	652d7d2c05	New translations ja.yml (French)	2018-08-09 02:36:35 +09:00
syuilo	0b0111fe23	New translations ja.yml (French)	2018-08-09 02:31:11 +09:00
syuilo	5d097fb29d	New translations ja.yml (French)	2018-08-08 00:51:48 +09:00
syuilo	f29fe986af	New translations ja.yml (French)	2018-08-08 00:43:05 +09:00
syuilo	0c774979c0	New translations ja.yml (French)	2018-08-08 00:32:08 +09:00
syuilo	f0bc2ed1d7	New translations ja.yml (French)	2018-08-08 00:22:38 +09:00
syuilo	b174e5e57a	New translations ja.yml (English)	2018-08-07 23:21:52 +09:00
syuilo	ae50b71c07	New translations ja.yml (Polish)	2018-08-07 20:53:54 +09:00
syuilo	b2eb50f260	New translations ja.yml (Catalan)	2018-08-07 13:31:40 +09:00
syuilo	790c7f2249	New translations ja.yml (Portuguese)	2018-08-07 13:31:38 +09:00
syuilo	6a0f34c283	New translations ja.yml (Korean)	2018-08-07 13:31:36 +09:00
syuilo	d151445db7	New translations ja.yml (Polish)	2018-08-07 13:31:34 +09:00
syuilo	18a3007273	New translations ja.yml (Chinese Simplified)	2018-08-07 13:31:31 +09:00
syuilo	bea8c3c65c	New translations ja.yml (Italian)	2018-08-07 13:31:29 +09:00
syuilo	391ee01fe3	New translations ja.yml (Russian)	2018-08-07 13:31:26 +09:00
syuilo	be7cf9f731	New translations ja.yml (English)	2018-08-07 13:31:24 +09:00
syuilo	b92c2aa40e	New translations ja.yml (Spanish)	2018-08-07 13:31:21 +09:00
syuilo	45ebcbf785	New translations ja.yml (German)	2018-08-07 13:31:19 +09:00
syuilo	5f32484be0	New translations ja.yml (French)	2018-08-07 13:31:17 +09:00
syuilo	e245122f12	New translations ja.yml (English)	2018-08-07 12:41:03 +09:00
syuilo	21570e2111	New translations ja.yml (Catalan)	2018-08-07 11:12:10 +09:00
syuilo	63e1165a01	New translations ja.yml (Portuguese)	2018-08-07 11:12:07 +09:00
syuilo	89b5a69127	New translations ja.yml (Korean)	2018-08-07 11:12:04 +09:00
syuilo	1152a9d03a	New translations ja.yml (Polish)	2018-08-07 11:12:02 +09:00
syuilo	10092d4570	New translations ja.yml (Chinese Simplified)	2018-08-07 11:12:00 +09:00
syuilo	429b4bec64	New translations ja.yml (Italian)	2018-08-07 11:11:58 +09:00
syuilo	99f96583b6	New translations ja.yml (Russian)	2018-08-07 11:11:56 +09:00
syuilo	5adb765f85	New translations ja.yml (English)	2018-08-07 11:11:54 +09:00
syuilo	0eb787e0d0	New translations ja.yml (Spanish)	2018-08-07 11:11:52 +09:00
syuilo	4493c856a9	New translations ja.yml (German)	2018-08-07 11:11:50 +09:00
syuilo	59d3d4a749	New translations ja.yml (French)	2018-08-07 11:11:47 +09:00