Update version

ツイートの埋め込み

.config/example.yml

@@ -41,9 +41,11 @@ redis:
   port: 6379
   pass: example-pass
 
-recaptcha:
-  site_key: example-site-key
-  secret_key: example-secret-key
+# Drive capacity of a local user (MB)
+localDriveCapacityMb: 256
+
+# Drive capacity of a remote user (MB)
+remoteDriveCapacityMb: 8
 
 # If enabled:
 #  Server will not cache remote files (Using direct link instead).
@@ -51,6 +53,21 @@ recaptcha:
 #  Users cannot see remote images when they turn off "Show media from a remote server" setting.
 preventCache: false
 
+drive:
+  storage: 'db'
+
+  # OR
+
+  # storage: 'minio'
+  # bucket:
+  # prefix:
+  # config:
+  #   endPoint:
+  #   port:
+  #   secure:
+  #   accessKey:
+  #   secretKey:
+
 #
 # Below settings are optional
 #
@@ -67,6 +84,11 @@ preventCache: false
 #   port: 9200
 #   pass: null
 
+# reCAPTCHA
+# recaptcha:
+#   site_key: example-site-key
+#  secret_key: example-secret-key
+
 # ServiceWorker
 # sw:
 #   # Public key of VAPID
@@ -81,3 +103,8 @@ preventCache: false
 # twitter:
 #   consumer_key: example-twitter-consumer-key
 #   consumer_secret: example-twitter-consumer-secret-key
+
+# Ghost
+# Ghost account is an account used for the purpose of delegating
+# followers when putting users in the list.
+# ghost: user-id-of-your-ghost-account

.github/ISSUE_TEMPLATE

@@ -1,7 +0,0 @@
-<!--
-Misskeyへの貢献ありがとうございます。
-
-バグの報告や提案などで、可能であれば以下の情報を含めてください。
-* お使いのブラウザ
-* デスクトップ版Misskeyかモバイル版Misskeyか
--->

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,22 @@
+---
+name: Bug Report
+about: Create a report to help us improve
+---
+
+# Summary
+<!-- Tell us what the bug is -->
+
+# Expected Behavior
+<!--- Tell us what should happen -->
+
+# Actual Behavior
+<!--- Tell us what happens instead of the expected behavior -->
+
+# Steps to Reproduce
+1.
+2.
+3.
+
+# Environment
+<!-- Tell us where on the platform it happens -->
+<!-- e.g. desktop or mobile version, your browser, your OS -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,11 @@
+---
+name: Feature Request
+about: Suggest an idea for this project
+---
+
+# Summary
+<!-- Tell us what the suggestion is -->
+
+# Environment
+<!-- Tell us where on the platform it related -->
+<!-- e.g. desktop or mobile version, your browser, your OS -->

.npmrc

@@ -1 +1,2 @@
 save-exact=true
+package-lock = false

.vscode/extensions.json

@@ -0,0 +1,12 @@
+{
+	"recommendations": [
+		"ducksoupdev.vue2",
+		"editorconfig.editorconfig",
+		"eg2.tslint",
+		"eg2.vscode-npm-script",
+		"hollowtree.vue-snippets",
+		"ms-vscode.typescript-javascript-grammar",
+		"octref.vetur",
+		"sysoev.language-stylus"
+	]
+}

CHANGELOG.md

@@ -5,6 +5,15 @@ ChangeLog
 
 This document describes breaking changes only.
 
+5.0.0
+-----
+
+### Migration
+
+起動する前に、`node cli/migration/5.0.0`してください。
+
+Please run `node cli/migration/5.0.0` before launch.
+
 4.0.0
 -----
 

README.md

@@ -7,7 +7,7 @@
 [![][dependencies-badge]][dependencies-link]
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Greenkeeper badge](https://badges.greenkeeper.io/syuilo/misskey.svg)](https://greenkeeper.io/)
 
-> Lead Maintainer: [syuilo][syuilo-link]
+**Microblogging. Redefined.**
 
 **[Misskey](https://misskey.xyz)** is a completely open source,
 ultimately sophisticated professional microblogging software.
@@ -18,14 +18,13 @@ ultimately sophisticated professional microblogging software.
 
 :sparkles: Features
 ----------------------------------------------------------------
+* Rich text contents
 * Reactions
 * User lists
 * Customizable column view (called MisskeyDeck)
   * and widgets!
 * Private messages
-* Mute
-* Real-time timelines
-* ActivityPub compatible
+* ActivityPub support
 
 and more! You can see it with your own eyes at [misskey.xyz](https://misskey.xyz).
 
@@ -44,9 +43,9 @@ If you want to...
 
 :heart: Backers & Sponsors
 ----------------------------------------------------------------
-| ![][nagarus-icon] | ![][dansup-icon] |
-|:-:|:-:|
-| [nagarus][nagarus-link] | [dansup][dansup-link] |
+| <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"> |
+|:-:|:-:|:-:|
+| [Gargron](https://www.patreon.com/mastodon) | [39ff](https://www.patreon.com/user/creators?u=12378075) | [dansup](https://www.patreon.com/dansup) |
 
 :four_leaf_clover: Copyright
 ----------------------------------------------------------------
@@ -73,9 +72,3 @@ Misskey is an open-source software licensed under the [GNU AGPLv3](LICENSE).
 
 [syuilo-link]:      https://syuilo.com
 [syuilo-icon]:      https://avatars2.githubusercontent.com/u/4439005?v=3&s=70
-
-[nagarus-link]: https://www.patreon.com/user/creators?u=11601413
-[nagarus-icon]: https://c10.patreonusercontent.com/3/eyJ2IjoiMSIsInciOjIwMH0%3D/patreon-media/user/11601413/20cb15f209924302b399b99d3c98b850?token-time=2145916800&token-hash=IO31nK6VZCMWBWU2VAk2c824BX2QZ4DNPKyHHZXS0iw%3D
-[dansup-link]: https://www.patreon.com/dansup
-[dansup-icon]: https://c10.patreonusercontent.com/3/eyJ2IjoiMSIsInciOjIwMH0%3D/patreon-media/user/4503830/ccf2cc867ea64de0b524bb2e24b9a1cb?token-time=2145916800&token-hash=opXAM_pnhUTuN1jCA6p_Nn_YsaqohY465YFjWFqMEEE%3D
-

appveyor.yml

@@ -1,41 +0,0 @@
-# appveyor file
-# http://www.appveyor.com/docs/appveyor-yml
-
-environment:
-  matrix:
-    - nodejs_version: 10.1.0
-
-cache:
-  - node_modules
-
-build: off
-
-install:
-  # Update Node.js
-  # 標準で入っている Node.js を更新します (2014/11/13 時点では、v0.10.32 が標準)
-  - ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version)
-  - node --version
-
-  # Update NPM
-  - npm install -g npm
-  - npm --version
-
-  # Update node-gyp
-  # 必須! node-gyp のバージョンを上げないと、ネイティブモジュールのコンパイルに失敗します
-  - npm install -g node-gyp
-
-  - npm install
-
-init:
-  # git clone の際の改行を変換しないようにします
-  - git config --global core.autocrlf false
-
-before_test:
-  # 設定ファイルを配置
-  - cp ./.travis/default.yml ./.config
-  - cp ./.travis/test.yml ./.config
-
-  - npm run build
-
-test_script:
-  - npm test

cli/clean-cached-remote-files.js

@@ -9,7 +9,7 @@ const q = {
 	'metadata._user.host': {
 		$ne: null
 	},
-	'metadata.isMetaOnly': false
+	'metadata.withoutChunks': false
 };
 
 async function main() {
@@ -57,7 +57,7 @@ async function main() {
 
 					DriveFile.update({ _id: file._id }, {
 						$set: {
-							'metadata.isMetaOnly': true
+							'metadata.withoutChunks': true
 						}
 					})
 				]).then(async () => {

cli/mark-admin.js

@@ -0,0 +1,23 @@
+const mongo = require('mongodb');
+const User = require('../built/models/user').default;
+
+const args = process.argv.slice(2);
+
+const user = args[0];
+
+const q = user.startsWith('@') ? {
+	username: user.split('@')[1],
+	host: user.split('@')[2] || null
+} : { _id: new mongo.ObjectID(user) };
+
+console.log(`Mark as admin ${user}...`);
+
+User.update(q, {
+	$set: {
+		isAdmin: true
+	}
+}).then(() => {
+	console.log(`Done ${user}`);
+}, e => {
+	console.error(e);
+});

cli/mark-verified.js

@@ -0,0 +1,23 @@
+const mongo = require('mongodb');
+const User = require('../built/models/user').default;
+
+const args = process.argv.slice(2);
+
+const user = args[0];
+
+const q = user.startsWith('@') ? {
+	username: user.split('@')[1],
+	host: user.split('@')[2] || null
+} : { _id: new mongo.ObjectID(user) };
+
+console.log(`Mark as verfied ${user}...`);
+
+User.update(q, {
+	$set: {
+		isVerified: true
+	}
+}).then(() => {
+	console.log(`Done ${user}`);
+}, e => {
+	console.error(e);
+});

cli/migration/2.0.0.js

@@ -3,8 +3,8 @@
 const chalk = require('chalk');
 const sequential = require('promise-sequential');
 
-const { default: User } = require('../built/models/user');
-const { default: DriveFile } = require('../built/models/drive-file');
+const { default: User } = require('../../built/models/user');
+const { default: DriveFile } = require('../../built/models/drive-file');
 
 async function main() {
 	const promiseGens = [];

cli/migration/2.4.0.js

@@ -3,8 +3,8 @@
 const chalk = require('chalk');
 const sequential = require('promise-sequential');
 
-const { default: User } = require('../built/models/user');
-const { default: DriveFile } = require('../built/models/drive-file');
+const { default: User } = require('../../built/models/user');
+const { default: DriveFile } = require('../../built/models/drive-file');
 
 async function main() {
 	const promiseGens = [];

cli/migration/5.0.0.js

@@ -0,0 +1,9 @@
+const { default: DriveFile } = require('../../built/models/drive-file');
+
+DriveFile.update({}, {
+	$rename: {
+		'metadata.isMetaOnly': 'metadata.withoutChunks'
+	}
+}, {
+	multi: true
+});

docker/Dockerfile

@@ -14,7 +14,7 @@ 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 imagemagick
+RUN pacman -S --noconfirm git nodejs npm mongodb redis
 
 COPY misskey.sh /root/misskey.sh
 RUN chmod u+x /root/misskey.sh

docs/README.md

@@ -0,0 +1,6 @@
+# Docs
+These docs are for contributors of Misskey or admins of instance of Misskey.
+Docs for users are located in `src/docs`.
+
+これらのドキュメントはMisskeyの開発者またはMisskeyインスタンス運営者向けです。
+利用者向けのドキュメントは`src/docs`にあります。

docs/manage.en.md

@@ -7,6 +7,16 @@ node_modules/kue/bin/kue-dashboard -p 3050
 ```
 When you access port 3050, you will see the UI.
 
+## Mark as 'admin' user
+``` shell
+node cli/mark-admin (User-ID or Username)
+```
+
+## Mark as 'verified' user
+``` shell
+node cli/mark-verified (User-ID or Username)
+```
+
 ## Suspend users
 ``` shell
 node cli/suspend (User-ID or Username)

docs/manage.ja.md

@@ -7,6 +7,16 @@ node_modules/kue/bin/kue-dashboard -p 3050
 ```
 ポート3050にアクセスするとUIが表示されます
 
+## 管理者ユーザーを設定する
+``` shell
+node cli/mark-admin (ユーザーID または ユーザー名)
+```
+
+## 'verified'ユーザーを設定する
+``` shell
+node cli/mark-verified (ユーザーID または ユーザー名)
+```
+
 ## ユーザーを凍結する
 ``` shell
 node cli/suspend (ユーザーID または ユーザー名)

docs/setup.en.md

@@ -22,16 +22,15 @@ adduser --disabled-password --disabled-login misskey
 Please install and setup these softwares:
 
 #### Dependencies :package:
-* *Node.js* and *npm*
+* **[Node.js](https://nodejs.org/en/)**
 * **[MongoDB](https://www.mongodb.com/)** >= 3.6
 * **[Redis](https://redis.io/)**
-* **[ImageMagick](http://www.imagemagick.org/script/index.php)** >= 7.0
 
 ##### Optional
 * [Elasticsearch](https://www.elastic.co/) - used to provide searching feature instead of MongoDB
 
 
-*3.* Setup Mongodb Database
+*3.* Setup MongoDB
 ----------------------------------------------------------------
 In root :
 1. `mongo` Go to the mongo shell
@@ -48,9 +47,9 @@ In root :
 4. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest)
 5. `npm install` Install misskey dependencies.
 
-*5.* reCAPTCHA tokens
+*(optional)* reCAPTCHA tokens
 ----------------------------------------------------------------
-Misskey requires reCAPTCHA tokens.
+If you want to enable reCAPTCHA, you need to generate reCAPTCHA tokens:
 Please visit https://www.google.com/recaptcha/intro/ and generate keys.
 
 *(optional)* Generating VAPID keys
@@ -63,13 +62,12 @@ npm install web-push -g
 web-push generate-vapid-keys
 ```
 
-
-*6.* Make configuration file
+*5.* Make configuration file
 ----------------------------------------------------------------
 1. `cp .config/example.yml .config/default.yml` Copy the `.config/example.yml` and rename it to `default.yml`.
 2. Edit `default.yml`
 
-*7.* Build Misskey
+*6.* Build Misskey
 ----------------------------------------------------------------
 
 Build misskey with the following:
@@ -85,7 +83,7 @@ If you're still encountering errors about some modules, use node-gyp:
 3. `node-gyp build`
 4. `npm run build`
 
-*8.* That is it.
+*7.* That is it.
 ----------------------------------------------------------------
 Well done! Now, you have an environment that run to Misskey.
 
@@ -126,3 +124,7 @@ You can check if the service is running with `systemctl status misskey`.
 2. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)`
 3. `npm install`
 4. `npm run build`
+
+----------------------------------------------------------------
+
+If you have any questions or troubles, feel free to contact us!

docs/setup.ja.md

@@ -22,15 +22,14 @@ adduser --disabled-password --disabled-login misskey
 これらのソフトウェアをインストール・設定してください:
 
 #### 依存関係 :package:
-* *Node.js* と *npm*
+* **[Node.js](https://nodejs.org/en/)**
 * **[MongoDB](https://www.mongodb.com/)** (3.6以上)
 * **[Redis](https://redis.io/)**
-* **[ImageMagick](http://www.imagemagick.org/script/index.php)**
 
 ##### オプション
 * [Elasticsearch](https://www.elastic.co/) - 検索機能を向上させるために用います。
 
-*3.* Mongodbの設定
+*3.* MongoDBの設定
 ----------------------------------------------------------------
 ルートで:
 1. `mongo` mongoシェルを起動
@@ -47,10 +46,10 @@ adduser --disabled-password --disabled-login misskey
 4. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` [最新のリリース](https://github.com/syuilo/misskey/releases/latest)を確認
 5. `npm install` Misskeyの依存パッケージをインストール
 
-*5.* reCAPTCHAトークン
+*(オプション)* reCAPTCHAトークン
 ----------------------------------------------------------------
-MisskeyはreCAPTCHAトークンを必要とします。
-https://www.google.com/recaptcha/intro/ にアクセスしてトークンを生成してください。
+reCAPTCHAを有効にする場合、reCAPTCHAトークンを取得する必要があります。
+https://www.google.com/recaptcha/intro/ にアクセスしてトークンを取得してください。
 
 *(オプション)* VAPIDキーペアの生成
 ----------------------------------------------------------------
@@ -61,12 +60,12 @@ npm install web-push -g
 web-push generate-vapid-keys
 ```
 
-*6.* Make configuration file
+*5.* 設定ファイルを作成する
 ----------------------------------------------------------------
 1. `cp .config/example.yml .config/default.yml` `.config/example.yml`をコピーし名前を`default.yml`にする。
 2. `default.yml` を編集する。
 
-*7.* Misskeyのビルド
+*6.* Misskeyのビルド
 ----------------------------------------------------------------
 
 次のコマンドでMisskeyをビルドしてください:
@@ -81,8 +80,7 @@ Debianをお使いであれば、`build-essential`パッケージをインスト
 3. `node-gyp build`
 4. `npm run build`
 
-
-*6.* 以上です！
+*7.* 以上です！
 ----------------------------------------------------------------
 お疲れ様でした。これでMisskeyを動かす準備は整いました。
 
@@ -123,13 +121,6 @@ WantedBy=multi-user.target
 3. `npm install`
 4. `npm run build`
 
-## メモリが足りなくてビルドできない場合
-Misskeyの(クライアントの)ビルドには、目安として8GBくらいのメモリを必要とします。
-VPSなどでビルドする時は、もしかしたらメモリが足りなくなる可能性があります。
-そうなった場合、もしVPSではなくあなたのPCが十分なメモリを搭載しているなら、あなたのPC上でビルドし、生成されたファイルをVPSにFTPでアップロードする方法を採ることができます。
+----------------------------------------------------------------
 
-1. あなたのPC上にMisskeyをインストールする
-2. 設定ファイルを用意する。設定ファイルは、サーバーに合わせた設定にします。
-3. npm run webpack
-4. built/client をサーバーにアップロードする
-5. サーバー上で、npm run gulp
+なにかお困りのことがありましたらお気軽にご連絡ください。

gulpfile.ts

@@ -23,7 +23,6 @@ const uglifyes = require('uglify-es');
 
 const locales = require('./locales');
 import { fa } from './src/misc/fa';
-const client = require('./built/client/meta.json');
 import config from './src/config';
 
 const uglify = uglifyComposer(uglifyes, console);
@@ -46,8 +45,6 @@ gulp.task('build', [
 	'doc'
 ]);
 
-gulp.task('rebuild', ['clean', 'build']);
-
 gulp.task('build:ts', () => {
 	const tsProject = ts.createProject('./tsconfig.json');
 
@@ -84,19 +81,19 @@ gulp.task('lint', () =>
 );
 
 gulp.task('format', () =>
-gulp.src('./src/**/*.ts')
-	.pipe(tslint({
-		formatter: 'verbose',
-		fix: true
-	}))
-	.pipe(tslint.report())
+	gulp.src('./src/**/*.ts')
+		.pipe(tslint({
+			formatter: 'verbose',
+			fix: true
+		}))
+		.pipe(tslint.report())
 );
 
 gulp.task('mocha', () =>
-	gulp.src([])
+	gulp.src('./test/**/*.ts')
 		.pipe(mocha({
 			exit: true,
-			compilers: 'ts:ts-node/register'
+			require: 'ts-node/register'
 		} as any))
 );
 
@@ -117,8 +114,9 @@ gulp.task('build:client', [
 	'copy:client'
 ]);
 
-gulp.task('build:client:script', () =>
-	gulp.src(['./src/client/app/boot.js', './src/client/app/safe.js'])
+gulp.task('build:client:script', () => {
+	const client = require('./built/client/meta.json');
+	return gulp.src(['./src/client/app/boot.js', './src/client/app/safe.js'])
 		.pipe(replace('VERSION', JSON.stringify(client.version)))
 		.pipe(replace('API', JSON.stringify(config.api_url)))
 		.pipe(replace('ENV', JSON.stringify(env)))
@@ -126,8 +124,8 @@ gulp.task('build:client:script', () =>
 		.pipe(isProduction ? uglify({
 			toplevel: true
 		} as any) : gutil.noop())
-		.pipe(gulp.dest('./built/client/assets/')) as any
-);
+		.pipe(gulp.dest('./built/client/assets/'));
+});
 
 gulp.task('build:client:styles', () =>
 	gulp.src('./src/client/app/init.css')

locales/ca.yml

@@ -51,6 +51,7 @@ common:
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  verified-user: "認証済みのユーザー"
   reversi:
     drawn: "引き分け"
     my-turn: "あなたのターンです"
@@ -288,6 +289,8 @@ desktop/views/components/drive.file.vue:
   banner: "バナー"
   contextmenu:
     rename: "名前を変更"
+    mark-as-sensitive: "閲覧注意に設定"
+    unmark-as-sensitive: "閲覧注意を解除"
     copy-url: "URLをコピー"
     download: "ダウンロード"
     else-files: "その他..."
@@ -331,6 +334,12 @@ desktop/views/components/drive.vue:
     create-folder: "フォルダーを作成"
     upload: "ファイルをアップロード"
     url-upload: "URLからアップロード"
+desktop/views/components/media-image.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
+desktop/views/components/media-video.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
 desktop/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
@@ -405,6 +414,8 @@ desktop/views/components/post-form.vue:
   insert-a-kao: "v('ω')v"
   create-poll: "アンケートを作成"
   text-remain: "残り{}文字"
+  recent-tags: "最近"
+  click-to-tagging: "クリックでタグ付け"
 desktop/views/components/post-form-window.vue:
   note: "新規投稿"
   reply: "返信"
@@ -725,6 +736,12 @@ mobile/views/components/drive.file-detail.vue:
   move: "移動"
   hash: "ハッシュ (md5)"
   exif: "EXIF"
+mobile/views/components/media-image.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
+mobile/views/components/media-video.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
 mobile/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
@@ -934,7 +951,16 @@ docs:
       properties: "プロパティ"
     endpoints:
       params: "パラメータ"
+      no-params: "パラメータはありません"
       res: "レスポンス"
+      require-credential: "このエンドポイントは認証情報が必須です。"
+      require-permission: "このエンドポイントは{permission}の権限を必要とします。"
+      has-limit: "レートリミットがあります。"
+      duration-limit: "直近{duration}ミリ秒の間のこのエンドポイントへのリクエスト数の合計が{max}を超える場合はリクエストできません。"
+      min-interval-limit: "前回のリクエストから{interval}ミリ秒経っていない場合はリクエストできません。"
+      show-src: "このエンドポイントのソースコードも閲覧できます。"
+      show-src-link: "コードをGitHubで見る"
+      generated: "このドキュメントはAPI定義に基づき自動生成されています。"
     props:
       name: "名前"
       type: "型"

locales/de.yml

@@ -51,6 +51,7 @@ common:
   my-token-regenerated: "Dein Token wurde generiert. Du wirst jetzt abgemeldet."
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  verified-user: "認証済みのユーザー"
   reversi:
     drawn: "引き分け"
     my-turn: "あなたのターンです"
@@ -288,6 +289,8 @@ desktop/views/components/drive.file.vue:
   banner: "Banner"
   contextmenu:
     rename: "Umbenennen"
+    mark-as-sensitive: "閲覧注意に設定"
+    unmark-as-sensitive: "閲覧注意を解除"
     copy-url: "URL kopieren"
     download: "Download"
     else-files: "Anderes…"
@@ -331,6 +334,12 @@ desktop/views/components/drive.vue:
     create-folder: "Ein Verzeichnis erstellen"
     upload: "Eine Datei hochladen"
     url-upload: "Von einer URL hochladen"
+desktop/views/components/media-image.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
+desktop/views/components/media-video.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
 desktop/views/components/follow-button.vue:
   following: "Folge ich"
   follow: "Folgen"
@@ -405,6 +414,8 @@ desktop/views/components/post-form.vue:
   insert-a-kao: "v('ω')v"
   create-poll: "Eine Abstimmung erstellen"
   text-remain: "{} Zeichen verbleibend"
+  recent-tags: "最近"
+  click-to-tagging: "クリックでタグ付け"
 desktop/views/components/post-form-window.vue:
   note: "Neue Notiz"
   reply: "Antworten"
@@ -725,6 +736,12 @@ mobile/views/components/drive.file-detail.vue:
   move: "移動"
   hash: "ハッシュ (md5)"
   exif: "EXIF"
+mobile/views/components/media-image.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
+mobile/views/components/media-video.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
 mobile/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
@@ -934,7 +951,16 @@ docs:
       properties: "プロパティ"
     endpoints:
       params: "パラメータ"
+      no-params: "パラメータはありません"
       res: "レスポンス"
+      require-credential: "このエンドポイントは認証情報が必須です。"
+      require-permission: "このエンドポイントは{permission}の権限を必要とします。"
+      has-limit: "レートリミットがあります。"
+      duration-limit: "直近{duration}ミリ秒の間のこのエンドポイントへのリクエスト数の合計が{max}を超える場合はリクエストできません。"
+      min-interval-limit: "前回のリクエストから{interval}ミリ秒経っていない場合はリクエストできません。"
+      show-src: "このエンドポイントのソースコードも閲覧できます。"
+      show-src-link: "コードをGitHubで見る"
+      generated: "このドキュメントはAPI定義に基づき自動生成されています。"
     props:
       name: "名前"
       type: "型"

locales/en.yml

@@ -51,6 +51,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"
   reversi:
     drawn: "Draw"
     my-turn: "Your turn"
@@ -288,6 +289,8 @@ desktop/views/components/drive.file.vue:
   banner: "Banner"
   contextmenu:
     rename: "Rename"
+    mark-as-sensitive: "Mark as 'sensitive'"
+    unmark-as-sensitive: "Unmark as 'sensitive'"
     copy-url: "Copy URL"
     download: "Download"
     else-files: "Others"
@@ -331,6 +334,12 @@ desktop/views/components/drive.vue:
     create-folder: "Create a folder"
     upload: "Upload a file"
     url-upload: "Upload from a URL"
+desktop/views/components/media-image.vue:
+  sensitive: "The content is NSFW"
+  click-to-show: "Click to show"
+desktop/views/components/media-video.vue:
+  sensitive: "The content is NSFW"
+  click-to-show: "Click to show"
 desktop/views/components/follow-button.vue:
   following: "Following"
   follow: "Follow"
@@ -405,6 +414,8 @@ desktop/views/components/post-form.vue:
   insert-a-kao: "v('ω')v"
   create-poll: "Create a poll"
   text-remain: "{} characters remaining"
+  recent-tags: "Recent"
+  click-to-tagging: "Click to tagging"
 desktop/views/components/post-form-window.vue:
   note: "New note"
   reply: "Reply"
@@ -725,6 +736,12 @@ mobile/views/components/drive.file-detail.vue:
   move: "Move"
   hash: "Hash (md5)"
   exif: "EXIF"
+mobile/views/components/media-image.vue:
+  sensitive: "The content is NSFW"
+  click-to-show: "Click to show"
+mobile/views/components/media-video.vue:
+  sensitive: "The content is NSFW"
+  click-to-show: "Click to show"
 mobile/views/components/follow-button.vue:
   following: "Following"
   follow: "Follow"
@@ -934,7 +951,16 @@ docs:
       properties: "Properties"
     endpoints:
       params: "Parameters"
+      no-params: "No parameter."
       res: "Response"
+      require-credential: "This endpoint requires the authentication information."
+      require-permission: "This endpoint requires {permission} permission."
+      has-limit: "There is a rate limit."
+      duration-limit: "You can't request when a frequency of a request in during {duration} milliseconds exceeds {max} times."
+      min-interval-limit: "You can't request before {interval} milliseconds has passed since previous request."
+      show-src: "You can view source code for this endpoint."
+      show-src-link: "See the code on GitHub"
+      generated: "This doc is generated by an API definition."
     props:
       name: "Name"
       type: "Type"

locales/es.yml

@@ -51,6 +51,7 @@ common:
   my-token-regenerated: "Tu token se ha regenerado vas a ser desconectado."
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  verified-user: "認証済みのユーザー"
   reversi:
     drawn: "引き分け"
     my-turn: "あなたのターンです"
@@ -288,6 +289,8 @@ desktop/views/components/drive.file.vue:
   banner: "Banner"
   contextmenu:
     rename: "Renombrar"
+    mark-as-sensitive: "閲覧注意に設定"
+    unmark-as-sensitive: "閲覧注意を解除"
     copy-url: "Copia la URL"
     download: "Descargar"
     else-files: "Otros"
@@ -331,6 +334,12 @@ desktop/views/components/drive.vue:
     create-folder: "Crear una carpeta"
     upload: "Subir fichero"
     url-upload: "Subir desde una URL"
+desktop/views/components/media-image.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
+desktop/views/components/media-video.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
 desktop/views/components/follow-button.vue:
   following: "Siguiendo"
   follow: "Sigue"
@@ -405,6 +414,8 @@ desktop/views/components/post-form.vue:
   insert-a-kao: "v('ω')v"
   create-poll: "Crea una encuesta"
   text-remain: "quedan {} caracteres"
+  recent-tags: "最近"
+  click-to-tagging: "クリックでタグ付け"
 desktop/views/components/post-form-window.vue:
   note: "Nota nueva"
   reply: "Responder"
@@ -725,6 +736,12 @@ mobile/views/components/drive.file-detail.vue:
   move: "移動"
   hash: "ハッシュ (md5)"
   exif: "EXIF"
+mobile/views/components/media-image.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
+mobile/views/components/media-video.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
 mobile/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
@@ -934,7 +951,16 @@ docs:
       properties: "プロパティ"
     endpoints:
       params: "パラメータ"
+      no-params: "パラメータはありません"
       res: "レスポンス"
+      require-credential: "このエンドポイントは認証情報が必須です。"
+      require-permission: "このエンドポイントは{permission}の権限を必要とします。"
+      has-limit: "レートリミットがあります。"
+      duration-limit: "直近{duration}ミリ秒の間のこのエンドポイントへのリクエスト数の合計が{max}を超える場合はリクエストできません。"
+      min-interval-limit: "前回のリクエストから{interval}ミリ秒経っていない場合はリクエストできません。"
+      show-src: "このエンドポイントのソースコードも閲覧できます。"
+      show-src-link: "コードをGitHubで見る"
+      generated: "このドキュメントはAPI定義に基づき自動生成されています。"
     props:
       name: "名前"
       type: "型"

locales/fr.yml

@@ -51,6 +51,7 @@ common:
   my-token-regenerated: "Votre token vient d'être généré, vous allez maintenant être déconnecté."
   i-like-sushi: "Je préfère les sushis (au pudding)"
   show-reversi-board-labels: "Afficher les étiquettes des lignes et colonnes dans Reversi"
+  verified-user: "認証済みのユーザー"
   reversi:
     drawn: "Partie nulle"
     my-turn: "C’est votre tour"
@@ -288,6 +289,8 @@ desktop/views/components/drive.file.vue:
   banner: "Bannière"
   contextmenu:
     rename: "Renommer"
+    mark-as-sensitive: "Marquer comme sensible"
+    unmark-as-sensitive: "Ne pas marquer comme sensible"
     copy-url: "Copier l'URL"
     download: "Télécharger"
     else-files: "Autres..."
@@ -331,6 +334,12 @@ desktop/views/components/drive.vue:
     create-folder: "Créer un dossier"
     upload: "Uploader un fichier"
     url-upload: "Uploader d'un URL"
+desktop/views/components/media-image.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "Cliquer pour afficher"
+desktop/views/components/media-video.vue:
+  sensitive: "Le contenu est NSFW"
+  click-to-show: "Cliquer pour afficher"
 desktop/views/components/follow-button.vue:
   following: "Abonnements"
   follow: "Suivre"
@@ -382,7 +391,7 @@ desktop/views/components/notes.note.vue:
 desktop/views/components/notes.vue:
   error: "Échec du chargement."
   retry: "Réessayer"
-  load-more: "もっと読み込む"
+  load-more: "Afficher plus"
 desktop/views/components/notifications.vue:
   more: "Plus"
   empty: "Pas de notifications"
@@ -405,6 +414,8 @@ desktop/views/components/post-form.vue:
   insert-a-kao: "v('ω')v"
   create-poll: "Créer un sondage"
   text-remain: "{} charactères restants"
+  recent-tags: "Récent"
+  click-to-tagging: "クリックでタグ付け"
 desktop/views/components/post-form-window.vue:
   note: "Nouvelle note"
   reply: "Répondre"
@@ -445,8 +456,8 @@ desktop/views/components/settings.vue:
   api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
   display: "Affichage et design"
   customize: "Personnaliser l'Accueil"
-  choose-wallpaper: "壁紙を選択"
-  delete-wallpaper: "壁紙を削除"
+  choose-wallpaper: "Sélectionner un fond d'écran"
+  delete-wallpaper: "Supprimer le fond d'écran"
   dark-mode: "Mode nuit"
   circle-icons: "Utiliser des icônes circulaires"
   gradient-window-header: "Utiliser les dégradés sur la barre de titre de la fenêtre"
@@ -474,7 +485,7 @@ desktop/views/components/settings.vue:
   cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
   cache-cleared: "Cache nettoyé"
   cache-cleared-desc: "Veuillez recharger la page."
-  auto-watch: "投稿の自動ウォッチ"
+  auto-watch: "Montre automatique"
   auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
   about: "À propose de Misskey"
   operator: "L'admin de cette instance"
@@ -542,9 +553,9 @@ desktop/views/components/settings.profile.vue:
   description: "Description"
   birthday: "Date de naissance"
   save: "Mettre à jour le profil"
-  locked-account: "アカウントの保護"
+  locked-account: "Protéger votre compte"
   is-locked: "投稿を非公開にする"
-  other: "その他"
+  other: "Autre"
   is-bot: "Ce compte est un Bot"
   is-cat: "Ce compte est un Chat"
 desktop/views/components/sub-note-content.vue:
@@ -557,7 +568,7 @@ desktop/views/components/taskmanager.vue:
 desktop/views/components/timeline.vue:
   home: "Accueil"
   local: "Local"
-  hybrid: "ソーシャル"
+  hybrid: "Social"
   global: "Global"
   list: "Listes"
 desktop/views/components/ui.header.vue:
@@ -607,7 +618,7 @@ desktop/views/components/window.vue:
 desktop/views/pages/deck/deck.tl-column.vue:
   is-media-only: "Les publications médias uniquement"
   is-media-view: "Vue média"
-  edit: "オプション"
+  edit: "Options"
 desktop/views/pages/deck/deck.note.vue:
   reposted-by: "Reposté par {}"
   private: "cette publication est privée"
@@ -665,7 +676,7 @@ desktop/views/pages/user/user.profile.vue:
   muted: "Muting"
   unmute: "Enlever la sourdine"
 desktop/views/pages/user/user.header.vue:
-  posts: "投稿"
+  posts: "Notes"
   following: "Suit"
   followers: "Abonnés"
   is-bot: "Ce compte est un Bot"
@@ -725,6 +736,12 @@ mobile/views/components/drive.file-detail.vue:
   move: "Déplacer"
   hash: "Hash (md5)"
   exif: "EXIF"
+mobile/views/components/media-image.vue:
+  sensitive: "Le contenu est NSFW"
+  click-to-show: "Cliquer pour afficher"
+mobile/views/components/media-video.vue:
+  sensitive: "Le contenu est NSFW"
+  click-to-show: "Cliquer pour afficher"
 mobile/views/components/follow-button.vue:
   following: "Abonnements"
   follow: "Suivre"
@@ -820,7 +837,7 @@ mobile/views/pages/following.vue:
 mobile/views/pages/home.vue:
   home: "Accueil"
   local: "Local"
-  hybrid: "ソーシャル"
+  hybrid: "Social"
   global: "Global"
 mobile/views/pages/messaging.vue:
   messaging: "Messagerie"
@@ -934,7 +951,16 @@ docs:
       properties: "Propriétés"
     endpoints:
       params: "Paramètres"
+      no-params: "Aucun paramètre"
       res: "Réponse"
+      require-credential: "このエンドポイントは認証情報が必須です。"
+      require-permission: "このエンドポイントは{permission}の権限を必要とします。"
+      has-limit: "レートリミットがあります。"
+      duration-limit: "直近{duration}ミリ秒の間のこのエンドポイントへのリクエスト数の合計が{max}を超える場合はリクエストできません。"
+      min-interval-limit: "前回のリクエストから{interval}ミリ秒経っていない場合はリクエストできません。"
+      show-src: "このエンドポイントのソースコードも閲覧できます。"
+      show-src-link: "Consulter le code sur GitHub"
+      generated: "このドキュメントはAPI定義に基づき自動生成されています。"
     props:
       name: "Nom"
       type: "Type"

locales/index.js

@@ -19,9 +19,9 @@ const langs = {
 	'es': loadLang('es')
 };
 
-Object.entries(langs).map(([, locale]) => {
+Object.values(langs).forEach(locale => {
 	// Extend native language (Japanese)
-	locale = Object.assign({}, native, locale);
+	Object.assign(locale, native);
 });
 
 module.exports = langs;

locales/it.yml

@@ -51,6 +51,7 @@ common:
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  verified-user: "認証済みのユーザー"
   reversi:
     drawn: "引き分け"
     my-turn: "あなたのターンです"
@@ -288,6 +289,8 @@ desktop/views/components/drive.file.vue:
   banner: "バナー"
   contextmenu:
     rename: "名前を変更"
+    mark-as-sensitive: "閲覧注意に設定"
+    unmark-as-sensitive: "閲覧注意を解除"
     copy-url: "URLをコピー"
     download: "ダウンロード"
     else-files: "その他..."
@@ -331,6 +334,12 @@ desktop/views/components/drive.vue:
     create-folder: "フォルダーを作成"
     upload: "ファイルをアップロード"
     url-upload: "URLからアップロード"
+desktop/views/components/media-image.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
+desktop/views/components/media-video.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
 desktop/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
@@ -405,6 +414,8 @@ desktop/views/components/post-form.vue:
   insert-a-kao: "v('ω')v"
   create-poll: "アンケートを作成"
   text-remain: "残り{}文字"
+  recent-tags: "最近"
+  click-to-tagging: "クリックでタグ付け"
 desktop/views/components/post-form-window.vue:
   note: "新規投稿"
   reply: "返信"
@@ -725,6 +736,12 @@ mobile/views/components/drive.file-detail.vue:
   move: "移動"
   hash: "ハッシュ (md5)"
   exif: "EXIF"
+mobile/views/components/media-image.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
+mobile/views/components/media-video.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
 mobile/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
@@ -934,7 +951,16 @@ docs:
       properties: "プロパティ"
     endpoints:
       params: "パラメータ"
+      no-params: "パラメータはありません"
       res: "レスポンス"
+      require-credential: "このエンドポイントは認証情報が必須です。"
+      require-permission: "このエンドポイントは{permission}の権限を必要とします。"
+      has-limit: "レートリミットがあります。"
+      duration-limit: "直近{duration}ミリ秒の間のこのエンドポイントへのリクエスト数の合計が{max}を超える場合はリクエストできません。"
+      min-interval-limit: "前回のリクエストから{interval}ミリ秒経っていない場合はリクエストできません。"
+      show-src: "このエンドポイントのソースコードも閲覧できます。"
+      show-src-link: "コードをGitHubで見る"
+      generated: "このドキュメントはAPI定義に基づき自動生成されています。"
     props:
       name: "名前"
       type: "型"

locales/ja.yml

@@ -56,6 +56,7 @@ common:
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  verified-user: "認証済みのユーザー"
 
   reversi:
     drawn: "引き分け"
@@ -330,6 +331,8 @@ desktop/views/components/drive.file.vue:
   banner: "バナー"
   contextmenu:
     rename: "名前を変更"
+    mark-as-sensitive: "閲覧注意に設定"
+    unmark-as-sensitive: "閲覧注意を解除"
     copy-url: "URLをコピー"
     download: "ダウンロード"
     else-files: "その他..."
@@ -377,6 +380,14 @@ desktop/views/components/drive.vue:
     upload: "ファイルをアップロード"
     url-upload: "URLからアップロード"
 
+desktop/views/components/media-image.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
+
+desktop/views/components/media-video.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
+
 desktop/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
@@ -466,6 +477,8 @@ desktop/views/components/post-form.vue:
   insert-a-kao: "v('ω')v"
   create-poll: "アンケートを作成"
   text-remain: "残り{}文字"
+  recent-tags: "最近"
+  click-to-tagging: "クリックでタグ付け"
 
 desktop/views/components/post-form-window.vue:
   note: "新規投稿"
@@ -853,6 +866,14 @@ mobile/views/components/drive.file-detail.vue:
   hash: "ハッシュ (md5)"
   exif: "EXIF"
 
+mobile/views/components/media-image.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
+
+mobile/views/components/media-video.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
+
 mobile/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
@@ -1098,7 +1119,16 @@ docs:
       properties: "プロパティ"
     endpoints:
       params: "パラメータ"
+      no-params: "パラメータはありません"
       res: "レスポンス"
+      require-credential: "このエンドポイントは認証情報が必須です。"
+      require-permission: "このエンドポイントは{permission}の権限を必要とします。"
+      has-limit: "レートリミットがあります。"
+      duration-limit: "直近{duration}ミリ秒の間のこのエンドポイントへのリクエスト数の合計が{max}を超える場合はリクエストできません。"
+      min-interval-limit: "前回のリクエストから{interval}ミリ秒経っていない場合はリクエストできません。"
+      show-src: "このエンドポイントのソースコードも閲覧できます。"
+      show-src-link: "コードをGitHubで見る"
+      generated: "このドキュメントはAPI定義に基づき自動生成されています。"
     props:
       name: "名前"
       type: "型"

locales/ko.yml

@@ -51,6 +51,7 @@ common:
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  verified-user: "認証済みのユーザー"
   reversi:
     drawn: "引き分け"
     my-turn: "あなたのターンです"
@@ -288,6 +289,8 @@ desktop/views/components/drive.file.vue:
   banner: "バナー"
   contextmenu:
     rename: "名前を変更"
+    mark-as-sensitive: "閲覧注意に設定"
+    unmark-as-sensitive: "閲覧注意を解除"
     copy-url: "URLをコピー"
     download: "ダウンロード"
     else-files: "その他..."
@@ -331,6 +334,12 @@ desktop/views/components/drive.vue:
     create-folder: "フォルダーを作成"
     upload: "ファイルをアップロード"
     url-upload: "URLからアップロード"
+desktop/views/components/media-image.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
+desktop/views/components/media-video.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
 desktop/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
@@ -405,6 +414,8 @@ desktop/views/components/post-form.vue:
   insert-a-kao: "v('ω')v"
   create-poll: "アンケートを作成"
   text-remain: "残り{}文字"
+  recent-tags: "最近"
+  click-to-tagging: "クリックでタグ付け"
 desktop/views/components/post-form-window.vue:
   note: "新規投稿"
   reply: "返信"
@@ -725,6 +736,12 @@ mobile/views/components/drive.file-detail.vue:
   move: "移動"
   hash: "ハッシュ (md5)"
   exif: "EXIF"
+mobile/views/components/media-image.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
+mobile/views/components/media-video.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
 mobile/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
@@ -934,7 +951,16 @@ docs:
       properties: "プロパティ"
     endpoints:
       params: "パラメータ"
+      no-params: "パラメータはありません"
       res: "レスポンス"
+      require-credential: "このエンドポイントは認証情報が必須です。"
+      require-permission: "このエンドポイントは{permission}の権限を必要とします。"
+      has-limit: "レートリミットがあります。"
+      duration-limit: "直近{duration}ミリ秒の間のこのエンドポイントへのリクエスト数の合計が{max}を超える場合はリクエストできません。"
+      min-interval-limit: "前回のリクエストから{interval}ミリ秒経っていない場合はリクエストできません。"
+      show-src: "このエンドポイントのソースコードも閲覧できます。"
+      show-src-link: "コードをGitHubで見る"
+      generated: "このドキュメントはAPI定義に基づき自動生成されています。"
     props:
       name: "名前"
       type: "型"

locales/pl.yml

@@ -51,6 +51,7 @@ common:
   my-token-regenerated: "Twój token został wygenerowany. Zostaniesz wylogowany."
   i-like-sushi: "Wolę sushi od puddingu"
   show-reversi-board-labels: "Pokazuj podpisy wierszy i kolumn w Reversi"
+  verified-user: "認証済みのユーザー"
   reversi:
     drawn: "Remis"
     my-turn: "Twoja kolej"
@@ -85,7 +86,7 @@ common:
     widgets: "Widżety"
     home: "Strona główna"
     local: "Lokalne"
-    hybrid: "ソーシャル"
+    hybrid: "Społeczność"
     global: "Globalne"
     notifications: "Powiadomienia"
     list: "Listy"
@@ -288,6 +289,8 @@ desktop/views/components/drive.file.vue:
   banner: "Baner"
   contextmenu:
     rename: "Zmień nazwę"
+    mark-as-sensitive: "閲覧注意に設定"
+    unmark-as-sensitive: "閲覧注意を解除"
     copy-url: "Skopiuj adres"
     download: "Pobierz"
     else-files: "Inne"
@@ -331,6 +334,12 @@ desktop/views/components/drive.vue:
     create-folder: "Utwórz katalog"
     upload: "Wyślij plik"
     url-upload: "Wyślij z adresu URL"
+desktop/views/components/media-image.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
+desktop/views/components/media-video.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
 desktop/views/components/follow-button.vue:
   following: "Śledzisz"
   follow: "Śledź"
@@ -405,6 +414,8 @@ desktop/views/components/post-form.vue:
   insert-a-kao: "v('ω')v"
   create-poll: "Utwórz ankietę"
   text-remain: "pozostałe znaki: {}"
+  recent-tags: "最近"
+  click-to-tagging: "クリックでタグ付け"
 desktop/views/components/post-form-window.vue:
   note: "Nowy wpis"
   reply: "Odpowiedz"
@@ -557,7 +568,7 @@ desktop/views/components/taskmanager.vue:
 desktop/views/components/timeline.vue:
   home: "Strona główna"
   local: "Lokalne"
-  hybrid: "ソーシャル"
+  hybrid: "Społeczność"
   global: "Globalne"
   list: "Listy"
 desktop/views/components/ui.header.vue:
@@ -725,6 +736,12 @@ mobile/views/components/drive.file-detail.vue:
   move: "Przenieś"
   hash: "Hash (md5)"
   exif: "EXIF"
+mobile/views/components/media-image.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
+mobile/views/components/media-video.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
 mobile/views/components/follow-button.vue:
   following: "Śledzisz"
   follow: "Śledź"
@@ -820,7 +837,7 @@ mobile/views/pages/following.vue:
 mobile/views/pages/home.vue:
   home: "Strona główna"
   local: "Lokalne"
-  hybrid: "ソーシャル"
+  hybrid: "Społeczność"
   global: "Globalne"
 mobile/views/pages/messaging.vue:
   messaging: "Wiadomości"
@@ -934,7 +951,16 @@ docs:
       properties: "Właściwości"
     endpoints:
       params: "Parametry"
+      no-params: "パラメータはありません"
       res: "Odpowiedź"
+      require-credential: "このエンドポイントは認証情報が必須です。"
+      require-permission: "このエンドポイントは{permission}の権限を必要とします。"
+      has-limit: "レートリミットがあります。"
+      duration-limit: "直近{duration}ミリ秒の間のこのエンドポイントへのリクエスト数の合計が{max}を超える場合はリクエストできません。"
+      min-interval-limit: "前回のリクエストから{interval}ミリ秒経っていない場合はリクエストできません。"
+      show-src: "このエンドポイントのソースコードも閲覧できます。"
+      show-src-link: "Zobacz kod na GitHubie"
+      generated: "このドキュメントはAPI定義に基づき自動生成されています。"
     props:
       name: "Nazwa"
       type: "Rodzaj"

locales/pt.yml

@@ -51,6 +51,7 @@ common:
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  verified-user: "認証済みのユーザー"
   reversi:
     drawn: "引き分け"
     my-turn: "あなたのターンです"
@@ -288,6 +289,8 @@ desktop/views/components/drive.file.vue:
   banner: "バナー"
   contextmenu:
     rename: "名前を変更"
+    mark-as-sensitive: "閲覧注意に設定"
+    unmark-as-sensitive: "閲覧注意を解除"
     copy-url: "URLをコピー"
     download: "ダウンロード"
     else-files: "その他..."
@@ -331,6 +334,12 @@ desktop/views/components/drive.vue:
     create-folder: "フォルダーを作成"
     upload: "ファイルをアップロード"
     url-upload: "URLからアップロード"
+desktop/views/components/media-image.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
+desktop/views/components/media-video.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
 desktop/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
@@ -405,6 +414,8 @@ desktop/views/components/post-form.vue:
   insert-a-kao: "v('ω')v"
   create-poll: "アンケートを作成"
   text-remain: "残り{}文字"
+  recent-tags: "最近"
+  click-to-tagging: "クリックでタグ付け"
 desktop/views/components/post-form-window.vue:
   note: "新規投稿"
   reply: "返信"
@@ -725,6 +736,12 @@ mobile/views/components/drive.file-detail.vue:
   move: "移動"
   hash: "ハッシュ (md5)"
   exif: "EXIF"
+mobile/views/components/media-image.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
+mobile/views/components/media-video.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
 mobile/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
@@ -934,7 +951,16 @@ docs:
       properties: "プロパティ"
     endpoints:
       params: "パラメータ"
+      no-params: "パラメータはありません"
       res: "レスポンス"
+      require-credential: "このエンドポイントは認証情報が必須です。"
+      require-permission: "このエンドポイントは{permission}の権限を必要とします。"
+      has-limit: "レートリミットがあります。"
+      duration-limit: "直近{duration}ミリ秒の間のこのエンドポイントへのリクエスト数の合計が{max}を超える場合はリクエストできません。"
+      min-interval-limit: "前回のリクエストから{interval}ミリ秒経っていない場合はリクエストできません。"
+      show-src: "このエンドポイントのソースコードも閲覧できます。"
+      show-src-link: "コードをGitHubで見る"
+      generated: "このドキュメントはAPI定義に基づき自動生成されています。"
     props:
       name: "名前"
       type: "型"

locales/ru.yml

@@ -51,6 +51,7 @@ common:
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  verified-user: "認証済みのユーザー"
   reversi:
     drawn: "引き分け"
     my-turn: "あなたのターンです"
@@ -288,6 +289,8 @@ desktop/views/components/drive.file.vue:
   banner: "バナー"
   contextmenu:
     rename: "名前を変更"
+    mark-as-sensitive: "閲覧注意に設定"
+    unmark-as-sensitive: "閲覧注意を解除"
     copy-url: "URLをコピー"
     download: "ダウンロード"
     else-files: "その他..."
@@ -331,6 +334,12 @@ desktop/views/components/drive.vue:
     create-folder: "フォルダーを作成"
     upload: "ファイルをアップロード"
     url-upload: "URLからアップロード"
+desktop/views/components/media-image.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
+desktop/views/components/media-video.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
 desktop/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
@@ -405,6 +414,8 @@ desktop/views/components/post-form.vue:
   insert-a-kao: "v('ω')v"
   create-poll: "アンケートを作成"
   text-remain: "残り{}文字"
+  recent-tags: "最近"
+  click-to-tagging: "クリックでタグ付け"
 desktop/views/components/post-form-window.vue:
   note: "新規投稿"
   reply: "返信"
@@ -725,6 +736,12 @@ mobile/views/components/drive.file-detail.vue:
   move: "移動"
   hash: "ハッシュ (md5)"
   exif: "EXIF"
+mobile/views/components/media-image.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
+mobile/views/components/media-video.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
 mobile/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
@@ -934,7 +951,16 @@ docs:
       properties: "プロパティ"
     endpoints:
       params: "パラメータ"
+      no-params: "パラメータはありません"
       res: "レスポンス"
+      require-credential: "このエンドポイントは認証情報が必須です。"
+      require-permission: "このエンドポイントは{permission}の権限を必要とします。"
+      has-limit: "レートリミットがあります。"
+      duration-limit: "直近{duration}ミリ秒の間のこのエンドポイントへのリクエスト数の合計が{max}を超える場合はリクエストできません。"
+      min-interval-limit: "前回のリクエストから{interval}ミリ秒経っていない場合はリクエストできません。"
+      show-src: "このエンドポイントのソースコードも閲覧できます。"
+      show-src-link: "コードをGitHubで見る"
+      generated: "このドキュメントはAPI定義に基づき自動生成されています。"
     props:
       name: "名前"
       type: "型"

locales/zh.yml

@@ -51,6 +51,7 @@ common:
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  verified-user: "認証済みのユーザー"
   reversi:
     drawn: "引き分け"
     my-turn: "あなたのターンです"
@@ -288,6 +289,8 @@ desktop/views/components/drive.file.vue:
   banner: "バナー"
   contextmenu:
     rename: "名前を変更"
+    mark-as-sensitive: "閲覧注意に設定"
+    unmark-as-sensitive: "閲覧注意を解除"
     copy-url: "URLをコピー"
     download: "ダウンロード"
     else-files: "その他..."
@@ -331,6 +334,12 @@ desktop/views/components/drive.vue:
     create-folder: "フォルダーを作成"
     upload: "ファイルをアップロード"
     url-upload: "URLからアップロード"
+desktop/views/components/media-image.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
+desktop/views/components/media-video.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
 desktop/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
@@ -405,6 +414,8 @@ desktop/views/components/post-form.vue:
   insert-a-kao: "v('ω')v"
   create-poll: "アンケートを作成"
   text-remain: "残り{}文字"
+  recent-tags: "最近"
+  click-to-tagging: "クリックでタグ付け"
 desktop/views/components/post-form-window.vue:
   note: "新規投稿"
   reply: "返信"
@@ -725,6 +736,12 @@ mobile/views/components/drive.file-detail.vue:
   move: "移動"
   hash: "ハッシュ (md5)"
   exif: "EXIF"
+mobile/views/components/media-image.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
+mobile/views/components/media-video.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
 mobile/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
@@ -934,7 +951,16 @@ docs:
       properties: "プロパティ"
     endpoints:
       params: "パラメータ"
+      no-params: "パラメータはありません"
       res: "レスポンス"
+      require-credential: "このエンドポイントは認証情報が必須です。"
+      require-permission: "このエンドポイントは{permission}の権限を必要とします。"
+      has-limit: "レートリミットがあります。"
+      duration-limit: "直近{duration}ミリ秒の間のこのエンドポイントへのリクエスト数の合計が{max}を超える場合はリクエストできません。"
+      min-interval-limit: "前回のリクエストから{interval}ミリ秒経っていない場合はリクエストできません。"
+      show-src: "このエンドポイントのソースコードも閲覧できます。"
+      show-src-link: "コードをGitHubで見る"
+      generated: "このドキュメントはAPI定義に基づき自動生成されています。"
     props:
       name: "名前"
       type: "型"

migration/README.md

@@ -1,11 +0,0 @@
-Misskeyの破壊的変更に対応するいくつかのスニペットがあります。
-MongoDBシェルで実行する必要のあるものとnodeで直接実行する必要のあるものがあります。
-ファイル名が `shell.` から始まるものは前者、 `node.` から始まるものは後者です。
-
-MongoDBシェルで実行する場合、`use`でデータベースを選択しておく必要があります。
-
-nodeで実行するいくつかのスニペットは、並列処理させる数を引数で設定できるものがあります。
-処理中にエラーで落ちる場合は、メモリが足りていない可能性があるので、少ない数に設定してみてください。
-※デフォルトは`5`です。
-
-ファイルを作成する際は `../init-migration-file.sh -t _type_ -n _name_` を実行すると _type_._unixtime_._name_.js が生成されます

migration/init-migration-file.sh

@@ -1,37 +0,0 @@
-#!/bin/bash
-
-usage() {
-		echo "$0 [-t type] [-n name]"
-		echo "  type: [node | shell]"
-		echo "  name: if no present, set untitled"
-		exit 0
-}
-
-while getopts :t:n:h OPT
-do
-	case $OPT in
-		t)	type=$OPTARG
-				;;
-		n)	name=$OPTARG
-				;;
-		h)	usage
-				;;
-		\?) usage
-				;;
-		:)	usage
-				;;
-	esac
-done
-
-if [ "$type" = "" ]
-then
-	echo "no type present!!!"
-	usage
-fi
-
-if [ "$name" = "" ]
-then
-	name="untitled"
-fi
-
-touch "$(realpath $(dirname $BASH_SOURCE))/migration/$type.$(date +%s).$name.js"

package.json

@@ -1,20 +1,18 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "4.20.0",
-	"clientVersion": "1.0.7257",
+	"version": "5.0.0",
+	"clientVersion": "1.0.7553",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
 	"scripts": {
 		"start": "node ./built",
 		"debug": "DEBUG=misskey:* node ./built",
-		"swagger": "node ./swagger.js",
 		"build": "webpack && gulp build",
 		"webpack": "webpack",
 		"watch": "webpack --watch",
 		"gulp": "gulp build",
-		"rebuild": "gulp rebuild",
 		"clean": "gulp clean",
 		"cleanall": "gulp cleanall",
 		"lint": "gulp lint",
@@ -35,7 +33,6 @@
 		"@types/deep-equal": "1.0.1",
 		"@types/elasticsearch": "5.0.25",
 		"@types/file-type": "5.2.1",
-		"@types/gm": "1.18.0",
 		"@types/gulp": "3.8.36",
 		"@types/gulp-htmlmin": "1.3.32",
 		"@types/gulp-mocha": "0.0.32",
@@ -59,11 +56,12 @@
 		"@types/koa-views": "2.0.3",
 		"@types/koa__cors": "2.2.2",
 		"@types/kue": "0.11.9",
+		"@types/minio": "6.0.2",
 		"@types/mkdirp": "0.5.2",
 		"@types/mocha": "5.2.3",
-		"@types/mongodb": "3.1.1",
+		"@types/mongodb": "3.1.2",
 		"@types/ms": "0.7.30",
-		"@types/node": "10.5.2",
+		"@types/node": "10.5.3",
 		"@types/parse5": "5.0.0",
 		"@types/portscanner": "2.1.0",
 		"@types/pug": "2.0.4",
@@ -74,12 +72,13 @@
 		"@types/request-promise-native": "1.0.15",
 		"@types/rimraf": "2.0.2",
 		"@types/seedrandom": "2.4.27",
+		"@types/sharp": "0.17.9",
 		"@types/showdown": "1.7.5",
 		"@types/single-line-log": "1.1.0",
 		"@types/speakeasy": "2.0.2",
 		"@types/tmp": "0.0.33",
 		"@types/uuid": "3.4.3",
-		"@types/webpack": "4.4.6",
+		"@types/webpack": "4.4.8",
 		"@types/webpack-stream": "3.2.10",
 		"@types/websocket": "0.0.39",
 		"@types/ws": "5.1.2",
@@ -100,34 +99,34 @@
 		"dompurify": "1.0.5",
 		"elasticsearch": "15.1.1",
 		"element-ui": "2.4.4",
-		"emojilib": "2.2.12",
+		"emojilib": "2.3.0",
 		"escape-regexp": "0.0.1",
 		"eslint": "5.0.1",
-		"eslint-plugin-vue": "4.7.0",
+		"eslint-plugin-vue": "4.7.1",
 		"eventemitter3": "3.1.0",
 		"exif-js": "2.3.0",
 		"file-loader": "1.1.11",
 		"file-type": "8.1.0",
 		"fuckadblock": "3.2.1",
-		"gm": "1.23.1",
 		"gulp": "3.9.1",
 		"gulp-cssnano": "2.1.3",
 		"gulp-htmlmin": "4.0.0",
 		"gulp-imagemin": "4.1.0",
 		"gulp-mocha": "6.0.0",
 		"gulp-pug": "4.0.1",
-		"gulp-rename": "1.3.0",
+		"gulp-rename": "1.4.0",
 		"gulp-replace": "1.0.0",
 		"gulp-sourcemaps": "2.6.4",
 		"gulp-stylus": "2.7.0",
 		"gulp-tslint": "8.1.3",
 		"gulp-typescript": "4.0.2",
-		"gulp-uglify": "3.0.0",
+		"gulp-uglify": "3.0.1",
 		"gulp-util": "3.0.8",
-		"hard-source-webpack-plugin": "0.11.1",
+		"hard-source-webpack-plugin": "0.11.2",
 		"highlight.js": "9.12.0",
 		"html-minifier": "3.5.19",
 		"http-signature": "1.2.0",
+		"insert-text-at-cursor": "0.1.1",
 		"is-root": "2.0.0",
 		"is-url": "1.2.4",
 		"jquery": "3.3.1",
@@ -148,6 +147,7 @@
 		"kue": "0.11.6",
 		"loader-utils": "1.1.0",
 		"mecab-async": "0.1.2",
+		"minio": "6.0.0",
 		"mkdirp": "0.5.1",
 		"mocha": "5.2.0",
 		"moji": "0.5.1",
@@ -164,12 +164,11 @@
 		"parse5": "5.0.0",
 		"portscanner": "2.2.0",
 		"progress-bar-webpack-plugin": "1.11.0",
-		"prominence": "0.2.0",
 		"promise-sequential": "1.1.1",
 		"pug": "2.0.3",
 		"punycode": "2.1.1",
 		"qrcode": "1.2.0",
-		"ratelimiter": "3.1.0",
+		"ratelimiter": "3.2.0",
 		"recaptcha-promise": "0.1.3",
 		"reconnecting-websocket": "3.2.2",
 		"redis": "2.8.0",
@@ -180,14 +179,15 @@
 		"s-age": "1.1.2",
 		"sass-loader": "7.0.3",
 		"seedrandom": "2.4.3",
+		"sharp": "0.20.5",
 		"showdown": "1.8.6",
+		"showdown-highlightjs-extension": "0.1.2",
 		"single-line-log": "1.1.2",
 		"speakeasy": "2.0.0",
 		"style-loader": "0.21.0",
 		"stylus": "0.54.5",
 		"stylus-loader": "3.0.2",
 		"summaly": "2.0.6",
-		"swagger-jsdoc": "1.9.7",
 		"syuilo-password-strength": "0.0.1",
 		"textarea-caret": "3.1.0",
 		"tmp": "0.0.33",
@@ -204,18 +204,19 @@
 		"vue-cropperjs": "2.2.1",
 		"vue-js-modal": "1.3.16",
 		"vue-json-tree-view": "2.1.4",
-		"vue-loader": "15.2.4",
+		"vue-loader": "15.2.6",
 		"vue-router": "3.0.1",
+		"vue-style-loader": "4.1.1",
 		"vue-template-compiler": "2.5.16",
 		"vuedraggable": "2.16.0",
 		"vuex": "3.0.1",
 		"vuex-persistedstate": "2.5.4",
 		"web-push": "3.3.2",
 		"webfinger.js": "2.6.6",
-		"webpack": "4.16.0",
-		"webpack-cli": "3.0.8",
+		"webpack": "4.16.2",
+		"webpack-cli": "3.1.0",
 		"websocket": "1.0.26",
-		"ws": "5.2.2",
+		"ws": "6.0.0",
 		"xev": "2.0.1"
 	},
 	"greenkeeper": {

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

@@ -2,7 +2,7 @@
 <div class="form">
 	<header>
 		<h1><i>{{ app.name }}</i>があなたのアカウントにアクセスすることを<b>許可</b>しますか？</h1>
-		<img :src="`${app.iconUrl}?thumbnail&size=64`"/>
+		<img :src="app.iconUrl"/>
 	</header>
 	<div class="app">
 		<section>

src/client/app/common/scripts/compose-notification.ts

@@ -17,21 +17,21 @@ export default function(type, data): Notification {
 			return {
 				title: 'ファイルがアップロードされました',
 				body: data.name,
-				icon: data.url + '?thumbnail&size=64'
+				icon: data.url
 			};
 
 		case 'unread_messaging_message':
 			return {
 				title: `${getUserName(data.user)}さんからメッセージ:`,
 				body: data.text, // TODO: getMessagingMessageSummary(data),
-				icon: data.user.avatarUrl + '?thumbnail&size=64'
+				icon: data.user.avatarUrl
 			};
 
 		case 'reversi_invited':
 			return {
 				title: '対局への招待があります',
 				body: `${getUserName(data.parent)}さんから`,
-				icon: data.parent.avatarUrl + '?thumbnail&size=64'
+				icon: data.parent.avatarUrl
 			};
 
 		case 'notification':
@@ -40,28 +40,28 @@ export default function(type, data): Notification {
 					return {
 						title: `${getUserName(data.user)}さんから:`,
 						body: getNoteSummary(data),
-						icon: data.user.avatarUrl + '?thumbnail&size=64'
+						icon: data.user.avatarUrl
 					};
 
 				case 'reply':
 					return {
 						title: `${getUserName(data.user)}さんから返信:`,
 						body: getNoteSummary(data),
-						icon: data.user.avatarUrl + '?thumbnail&size=64'
+						icon: data.user.avatarUrl
 					};
 
 				case 'quote':
 					return {
 						title: `${getUserName(data.user)}さんが引用:`,
 						body: getNoteSummary(data),
-						icon: data.user.avatarUrl + '?thumbnail&size=64'
+						icon: data.user.avatarUrl
 					};
 
 				case 'reaction':
 					return {
 						title: `${getUserName(data.user)}: ${getReactionEmoji(data.reaction)}:`,
 						body: getNoteSummary(data.note),
-						icon: data.user.avatarUrl + '?thumbnail&size=64'
+						icon: data.user.avatarUrl
 					};
 
 				default:

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

@@ -39,13 +39,17 @@ export default Vue.extend({
 		dark: {
 			type: Boolean,
 			default: false
+		},
+		smooth: {
+			type: Boolean,
+			default: false
 		}
 	},
 
 	data() {
 		return {
 			now: new Date(),
-			clock: null,
+			enabled: true,
 
 			graduationsPadding: 0.5,
 			handsPadding: 1,
@@ -74,6 +78,9 @@ export default Vue.extend({
 			return themeColor;
 		},
 
+		ms(): number {
+			return this.now.getMilliseconds() * this.smooth;
+		}
 		s(): number {
 			return this.now.getSeconds();
 		},
@@ -85,13 +92,13 @@ export default Vue.extend({
 		},
 
 		hAngle(): number {
-			return Math.PI * (this.h % 12 + this.m / 60) / 6;
+			return Math.PI * (this.h % 12 + (this.m + (this.s + this.ms / 1000) / 60) / 60) / 6;
 		},
 		mAngle(): number {
-			return Math.PI * (this.m + this.s / 60) / 30;
+			return Math.PI * (this.m + (this.s + this.ms / 1000) / 60) / 30;
 		},
 		sAngle(): number {
-			return Math.PI * this.s / 30;
+			return Math.PI * (this.s + this.ms / 1000) / 30;
 		},
 
 		graduations(): any {
@@ -106,11 +113,17 @@ export default Vue.extend({
 	},
 
 	mounted() {
-		this.clock = setInterval(this.tick, 1000);
+		const update = () => {
+			if (this.enabled) {
+				this.tick();
+				requestAnimationFrame(update);
+			}
+		};
+		update();
 	},
 
 	beforeDestroy() {
-		clearInterval(this.clock);
+		this.enabled = false;
 	},
 
 	methods: {

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

@@ -2,11 +2,16 @@
 <div class="mk-autocomplete" @contextmenu.prevent="() => {}">
 	<ol class="users" ref="suggests" v-if="users.length > 0">
 		<li v-for="user in users" @click="complete(type, user)" @keydown="onKeydown" tabindex="-1">
-			<img class="avatar" :src="`${user.avatarUrl}?thumbnail&size=32`" alt=""/>
+			<img class="avatar" :src="user.avatarUrl" alt=""/>
 			<span class="name">{{ user | userName }}</span>
 			<span class="username">@{{ user | acct }}</span>
 		</li>
 	</ol>
+	<ol class="hashtags" ref="suggests" v-if="hashtags.length > 0">
+		<li v-for="hashtag in hashtags" @click="complete(type, hashtag)" @keydown="onKeydown" tabindex="-1">
+			<span class="name">{{ hashtag }}</span>
+		</li>
+	</ol>
 	<ol class="emojis" ref="suggests" v-if="emojis.length > 0">
 		<li v-for="emoji in emojis" @click="complete(type, emoji.emoji)" @keydown="onKeydown" tabindex="-1">
 			<span class="emoji">{{ emoji.emoji }}</span>
@@ -48,33 +53,33 @@ emjdb.sort((a, b) => a.name.length - b.name.length);
 
 export default Vue.extend({
 	props: ['type', 'q', 'textarea', 'complete', 'close', 'x', 'y'],
+
 	data() {
 		return {
 			fetching: true,
 			users: [],
+			hashtags: [],
 			emojis: [],
 			select: -1,
 			emojilib
 		}
 	},
+
 	computed: {
 		items(): HTMLCollection {
 			return (this.$refs.suggests as Element).children;
 		}
 	},
+
 	updated() {
 		//#region 位置調整
-		const margin = 32;
-
-		if (this.x + this.$el.offsetWidth > window.innerWidth - margin) {
-			this.$el.style.left = (this.x - this.$el.offsetWidth) + 'px';
-			this.$el.style.marginLeft = '-16px';
+		if (this.x + this.$el.offsetWidth > window.innerWidth) {
+			this.$el.style.left = (window.innerWidth - this.$el.offsetWidth) + 'px';
 		} else {
 			this.$el.style.left = this.x + 'px';
-			this.$el.style.marginLeft = '0';
 		}
 
-		if (this.y + this.$el.offsetHeight > window.innerHeight - margin) {
+		if (this.y + this.$el.offsetHeight > window.innerHeight) {
 			this.$el.style.top = (this.y - this.$el.offsetHeight) + 'px';
 			this.$el.style.marginTop = '0';
 		} else {
@@ -83,6 +88,7 @@ export default Vue.extend({
 		}
 		//#endregion
 	},
+
 	mounted() {
 		this.textarea.addEventListener('keydown', this.onKeydown);
 
@@ -100,6 +106,7 @@ export default Vue.extend({
 			});
 		});
 	},
+
 	beforeDestroy() {
 		this.textarea.removeEventListener('keydown', this.onKeydown);
 
@@ -107,6 +114,7 @@ export default Vue.extend({
 			el.removeEventListener('mousedown', this.onMousedown);
 		});
 	},
+
 	methods: {
 		exec() {
 			this.select = -1;
@@ -117,7 +125,8 @@ export default Vue.extend({
 			}
 
 			if (this.type == 'user') {
-				const cache = sessionStorage.getItem(this.q);
+				const cacheKey = 'autocomplete:user:' + this.q;
+				const cache = sessionStorage.getItem(cacheKey);
 				if (cache) {
 					const users = JSON.parse(cache);
 					this.users = users;
@@ -131,9 +140,33 @@ export default Vue.extend({
 						this.fetching = false;
 
 						// キャッシュ
-						sessionStorage.setItem(this.q, JSON.stringify(users));
+						sessionStorage.setItem(cacheKey, JSON.stringify(users));
 					});
 				}
+			} else if (this.type == 'hashtag') {
+				if (this.q == null || this.q == '') {
+					this.hashtags = JSON.parse(localStorage.getItem('hashtags') || '[]');
+					this.fetching = false;
+				} else {
+					const cacheKey = 'autocomplete:hashtag:' + this.q;
+					const cache = sessionStorage.getItem(cacheKey);
+					if (cache) {
+						const hashtags = JSON.parse(cache);
+						this.hashtags = hashtags;
+						this.fetching = false;
+					} else {
+						(this as any).api('hashtags/search', {
+							query: this.q,
+							limit: 30
+						}).then(hashtags => {
+							this.hashtags = hashtags;
+							this.fetching = false;
+
+							// キャッシュ
+							sessionStorage.setItem(cacheKey, JSON.stringify(hashtags));
+						});
+					}
+				}
 			} else if (this.type == 'emoji') {
 				const matched = [];
 				emjdb.some(x => {
@@ -231,6 +264,7 @@ export default Vue.extend({
 root(isDark)
 	position fixed
 	z-index 65535
+	max-width 100%
 	margin-top calc(1em + 8px)
 	overflow hidden
 	background isDark ? #313543 : #fff
@@ -248,7 +282,8 @@ root(isDark)
 		list-style none
 
 		> li
-			display block
+			display flex
+			align-items center
 			padding 4px 12px
 			white-space nowrap
 			overflow hidden
@@ -259,7 +294,13 @@ root(isDark)
 			&, *
 				user-select none
 
+			*
+				overflow hidden
+				text-overflow ellipsis
+
 			&:hover
+				background isDark ? rgba(#fff, 0.1) : rgba(#000, 0.1)
+
 			&[data-selected='true']
 				background $theme-color
 
@@ -275,7 +316,6 @@ root(isDark)
 	> .users > li
 
 		.avatar
-			vertical-align middle
 			min-width 28px
 			min-height 28px
 			max-width 28px
@@ -284,14 +324,17 @@ root(isDark)
 			border-radius 100%
 
 		.name
-			vertical-align middle
 			margin 0 8px 0 0
 			color isDark ? rgba(#fff, 0.8) : rgba(#000, 0.8)
 
 		.username
-			vertical-align middle
 			color isDark ? rgba(#fff, 0.3) : rgba(#000, 0.3)
 
+	> .hashtags > li
+
+		.name
+			color isDark ? rgba(#fff, 0.8) : rgba(#000, 0.8)
+
 	> .emojis > li
 
 		.emoji
@@ -300,11 +343,11 @@ root(isDark)
 			width 24px
 
 		.name
-			color rgba(#000, 0.8)
+			color isDark ? rgba(#fff, 0.8) : rgba(#000, 0.8)
 
 		.alias
 			margin 0 0 0 8px
-			color rgba(#000, 0.3)
+			color isDark ? rgba(#fff, 0.3) : rgba(#000, 0.3)
 
 .mk-autocomplete[data-darkmode]
 	root(true)

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

@@ -31,7 +31,7 @@ export default Vue.extend({
 					: this.user.avatarColor && this.user.avatarColor.length == 3
 						? `rgb(${ this.user.avatarColor.join(',') })`
 						: null,
-				backgroundImage: this.lightmode ? null : `url(${ this.user.avatarUrl }?thumbnail)`,
+				backgroundImage: this.lightmode ? null : `url(${ this.user.avatarUrl })`,
 				borderRadius: this.$store.state.settings.circleIcons ? '100%' : null
 			};
 		}

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

@@ -26,8 +26,8 @@
 						:class="{ empty: stone == null, none: o.map[i] == 'null', isEnded: game.isEnded, myTurn: !game.isEnded && isMyTurn, can: turnUser ? o.canPut(turnUser.id == blackUser.id, i) : null, prev: o.prevPos == i }"
 						@click="set(i)"
 						:title="`${String.fromCharCode(65 + o.transformPosToXy(i)[0])}${o.transformPosToXy(i)[1] + 1}`">
-					<img v-if="stone === true" :src="`${blackUser.avatarUrl}?thumbnail&size=128`" alt="">
-					<img v-if="stone === false" :src="`${whiteUser.avatarUrl}?thumbnail&size=128`" alt="">
+					<img v-if="stone === true" :src="blackUser.avatarUrl" alt="">
+					<img v-if="stone === false" :src="whiteUser.avatarUrl" alt="">
 				</div>
 			</div>
 			<div class="labels-y" v-if="this.$store.state.settings.reversiBoardLabels">

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

@@ -112,7 +112,7 @@ export default Vue.extend({
 
 	computed: {
 		mapCategories(): string[] {
-			const categories = Object.entries(maps).map(x => x[1].category);
+			const categories = Object.values(maps).map(x => x.category);
 			return categories.filter((item, pos) => categories.indexOf(item) == pos);
 		},
 		isAccepted(): boolean {
@@ -179,8 +179,8 @@ export default Vue.extend({
 			if (this.game.settings.map == null) {
 				this.mapName = null;
 			} else {
-				const foundMap = Object.entries(maps).find(x => x[1].data.join('') == this.game.settings.map.join(''));
-				this.mapName = foundMap ? foundMap[1].name : '-Custom-';
+				const found = Object.values(maps).find(x => x.data.join('') == this.game.settings.map.join(''));
+				this.mapName = found ? found.name : '-Custom-';
 			}
 		},
 
@@ -206,7 +206,7 @@ export default Vue.extend({
 			if (v == null) {
 				this.game.settings.map = null;
 			} else {
-				this.game.settings.map = Object.entries(maps).find(x => x[1].name == v)[1].data;
+				this.game.settings.map = Object.values(maps).find(x => x.name == v).data;
 			}
 			this.$forceUpdate();
 			this.updateSettings();
@@ -217,9 +217,9 @@ export default Vue.extend({
 			const y = Math.floor(pos / this.game.settings.map[0].length);
 			const newPixel =
 				pixel == ' ' ? '-' :
-				pixel == '-' ? 'b' :
-				pixel == 'b' ? 'w' :
-				' ';
+					pixel == '-' ? 'b' :
+						pixel == 'b' ? 'w' :
+							' ';
 			const line = this.game.settings.map[y].split('');
 			line[x] = newPixel;
 			this.$set(this.game.settings.map, y, line.join(''));

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

@@ -46,33 +46,45 @@ export default Vue.extend({
 		display grid
 		grid-gap 4px
 
+		> *
+			overflow hidden
+			border-radius 4px
+
 		&[data-count="1"]
 			grid-template-rows 1fr
+
 		&[data-count="2"]
 			grid-template-columns 1fr 1fr
 			grid-template-rows 1fr
+
 		&[data-count="3"]
 			grid-template-columns 1fr 0.5fr
 			grid-template-rows 1fr 1fr
-			:nth-child(1)
+
+			> *:nth-child(1)
 				grid-row 1 / 3
-			:nth-child(3)
+
+			> *:nth-child(3)
 				grid-column 2 / 3
 				grid-row 2 / 3
+
 		&[data-count="4"]
 			grid-template-columns 1fr 1fr
 			grid-template-rows 1fr 1fr
 
-		:nth-child(1)
+		> *:nth-child(1)
 			grid-column 1 / 2
 			grid-row 1 / 2
-		:nth-child(2)
+
+		> *:nth-child(2)
 			grid-column 2 / 3
 			grid-row 1 / 2
-		:nth-child(3)
+
+		> *:nth-child(3)
 			grid-column 1 / 2
 			grid-row 2 / 3
-		:nth-child(4)
+
+		> *:nth-child(4)
 			grid-column 2 / 3
 			grid-row 2 / 3
 

src/client/app/common/views/components/messaging-room.form.vue

@@ -119,7 +119,7 @@ export default Vue.extend({
 		},
 
 		onKeypress(e) {
-			if ((e.which == 10 || e.which == 13) && e.ctrlKey) {
+			if ((e.which == 10 || e.which == 13) && e.ctrlKey && this.canSend) {
 				this.send();
 			}
 		},

src/client/app/common/views/components/messaging-room.message.vue

@@ -3,10 +3,9 @@
 	<mk-avatar class="avatar" :user="message.user" target="_blank"/>
 	<div class="content">
 		<div class="balloon" :data-no-text="message.text == null">
-			<p class="read" v-if="isMe && message.isRead">%i18n:@is-read%</p>
-			<button class="delete-button" v-if="isMe" title="%i18n:common.delete%">
+			<!-- <button class="delete-button" v-if="isMe" title="%i18n:common.delete%">
 				<img src="/assets/desktop/messaging/delete.png" alt="Delete"/>
-			</button>
+			</button> -->
 			<div class="content" v-if="!message.isDeleted">
 				<misskey-flavored-markdown class="text" v-if="message.text" ref="text" :text="message.text" :i="$store.state.i"/>
 				<div class="file" v-if="message.file">
@@ -23,6 +22,7 @@
 		<div></div>
 		<mk-url-preview v-for="url in urls" :url="url" :key="url"/>
 		<footer>
+			<span class="read" v-if="isMe && message.isRead">%i18n:@is-read%</span>
 			<mk-time :time="message.createdAt"/>
 			<template v-if="message.is_edited">%fa:pencil-alt%</template>
 		</footer>
@@ -120,17 +120,6 @@ root(isDark)
 					height 16px
 					cursor pointer
 
-			> .read
-				user-select none
-				display block
-				position absolute
-				z-index 1
-				bottom -4px
-				left -12px
-				margin 0
-				color isDark ? rgba(#fff, 0.5) : rgba(#000, 0.5)
-				font-size 11px
-
 			> .content
 
 				> .is-deleted
@@ -258,6 +247,12 @@ root(isDark)
 			> footer
 				text-align right
 
+				> .read
+					user-select none
+					margin 0 4px 0 0
+					color isDark ? rgba(#fff, 0.5) : rgba(#000, 0.5)
+					font-size 11px
+
 	&[data-is-deleted]
 		> .baloon
 			opacity 0.5

src/client/app/common/views/components/note-header.vue

@@ -2,6 +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-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>
@@ -69,6 +70,10 @@ root(isDark)
 		&:hover
 			text-decoration underline
 
+	> .is-verified
+		margin-right 8px
+		color #4dabf7
+
 	> .is-admin
 	> .is-bot
 	> .is-cat

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

@@ -29,11 +29,7 @@
 			<p slot="text" v-if="passwordRetypeState == 'not-match'" style="color:#FF1161">%fa:exclamation-triangle .fw% %i18n:@password-not-matched%</p>
 		</div>
 	</ui-input>
-	<div class="g-recaptcha" :data-sitekey="recaptchaSitekey" style="margin: 16px 0;"></div>
-	<label class="agree-tou" style="display: block; margin: 16px 0;">
-		<input name="agree-tou" type="checkbox" required/>
-		<p><a :href="touUrl" target="_blank">利用規約</a>に同意する</p>
-	</label>
+	<div v-if="recaptchaSitekey != null" class="g-recaptcha" :data-sitekey="recaptchaSitekey" style="margin: 16px 0;"></div>
 	<ui-button type="submit">%i18n:@create%</ui-button>
 </form>
 </template>
@@ -41,7 +37,7 @@
 <script lang="ts">
 import Vue from 'vue';
 const getPasswordStrength = require('syuilo-password-strength');
-import { host, url, docsUrl, lang, recaptchaSitekey } from '../../../config';
+import { host, url, recaptchaSitekey } from '../../../config';
 
 export default Vue.extend({
 	data() {
@@ -51,7 +47,6 @@ export default Vue.extend({
 			password: '',
 			retypedPassword: '',
 			url,
-			touUrl: `${docsUrl}/${lang}/tou`,
 			recaptchaSitekey,
 			usernameState: null,
 			passwordStrength: '',
@@ -115,7 +110,7 @@ export default Vue.extend({
 			(this as any).api('signup', {
 				username: this.username,
 				password: this.password,
-				'g-recaptcha-response': (window as any).grecaptcha.getResponse()
+				'g-recaptcha-response': recaptchaSitekey != null ? (window as any).grecaptcha.getResponse() : null
 			}).then(() => {
 				(this as any).api('signin', {
 					username: this.username,
@@ -126,15 +121,19 @@ export default Vue.extend({
 			}).catch(() => {
 				alert('%i18n:@some-error%');
 
-				(window as any).grecaptcha.reset();
+				if (recaptchaSitekey != null) {
+					(window as any).grecaptcha.reset();
+				}
 			});
 		}
 	},
 	mounted() {
-		const head = document.getElementsByTagName('head')[0];
-		const script = document.createElement('script');
-		script.setAttribute('src', 'https://www.google.com/recaptcha/api.js');
-		head.appendChild(script);
+		if (recaptchaSitekey != null) {
+			const head = document.getElementsByTagName('head')[0];
+			const script = document.createElement('script');
+			script.setAttribute('src', 'https://www.google.com/recaptcha/api.js');
+			head.appendChild(script);
+		}
 	}
 });
 </script>
@@ -144,22 +143,4 @@ export default Vue.extend({
 
 .mk-signup
 	min-width 302px
-
-	.agree-tou
-		padding 4px
-		border-radius 4px
-
-		&:hover
-			background #f4f4f4
-
-		&:active
-			background #eee
-
-		&, *
-			cursor pointer
-
-		p
-			display inline
-			color #555
-
 </style>

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

@@ -2,6 +2,9 @@
 <iframe v-if="youtubeId" type="text/html" height="250"
 	:src="`https://www.youtube.com/embed/${youtubeId}?origin=${misskeyUrl}`"
 	frameborder="0"/>
+<blockquote v-else-if="tweetUrl" class="twitter-tweet" ref="tweet">
+	<a :href="url"></a>
+</blockquote>
 <div v-else class="mk-url-preview">
 	<a :href="url" target="_blank" :title="url" v-if="!fetching">
 		<div class="thumbnail" v-if="thumbnail" :style="`background-image: url(${thumbnail})`"></div>
@@ -34,6 +37,7 @@ export default Vue.extend({
 			icon: null,
 			sitename: null,
 			youtubeId: null,
+			tweetUrl: null,
 			misskeyUrl
 		};
 	},
@@ -44,6 +48,25 @@ export default Vue.extend({
 			this.youtubeId = url.searchParams.get('v');
 		} else if (url.hostname == 'youtu.be') {
 			this.youtubeId = url.pathname;
+		} else if (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);
+
+			if (twttr.widgets) {
+				Vue.nextTick(loadTweet);
+			} else {
+				const wjsId = 'twitter-wjs';
+				if (!document.getElementById(wjsId)) {
+					const head = document.getElementsByTagName('head')[0];
+					const script = document.createElement('script');
+					script.setAttribute('id', wjsId);
+					script.setAttribute('src', 'https://platform.twitter.com/widgets.js');
+					head.appendChild(script);
+				}
+				twttr.ready = loadTweet;
+				(window as any).twttr = twttr;
+			}
 		} else {
 			fetch('/url?url=' + encodeURIComponent(this.url)).then(res => {
 				res.json().then(info => {

src/client/app/common/views/directives/autocomplete.ts

@@ -1,5 +1,6 @@
 import * as getCaretCoordinates from 'textarea-caret';
 import MkAutocomplete from '../components/autocomplete.vue';
+import renderAcct from '../../../../../misc/acct/render';
 
 export default {
 	bind(el, binding, vn) {
@@ -67,15 +68,30 @@ class Autocomplete {
 	 * テキスト入力時
 	 */
 	private onInput() {
-		const caret = this.textarea.selectionStart;
-		const text = this.text.substr(0, caret);
+		const caretPos = this.textarea.selectionStart;
+		const text = this.text.substr(0, caretPos);
 
 		const mentionIndex = text.lastIndexOf('@');
+		const hashtagIndex = text.lastIndexOf('#');
 		const emojiIndex = text.lastIndexOf(':');
 
+		const start = Math.min(
+			mentionIndex == -1 ? Infinity : mentionIndex,
+			hashtagIndex == -1 ? Infinity : hashtagIndex,
+			emojiIndex == -1 ? Infinity : emojiIndex);
+
+		if (start == Infinity) {
+			this.close();
+			return;
+		}
+
+		const isMention = mentionIndex == start;
+		const isHashtag = hashtagIndex == start;
+		const isEmoji = emojiIndex == start;
+
 		let opened = false;
 
-		if (mentionIndex != -1 && mentionIndex > emojiIndex) {
+		if (isMention) {
 			const username = text.substr(mentionIndex + 1);
 			if (username != '' && username.match(/^[a-zA-Z0-9_]+$/)) {
 				this.open('user', username);
@@ -83,7 +99,15 @@ class Autocomplete {
 			}
 		}
 
-		if (emojiIndex != -1 && emojiIndex > mentionIndex) {
+		if (isHashtag || opened == false) {
+			const hashtag = text.substr(hashtagIndex + 1);
+			if (!hashtag.includes(' ') && !hashtag.includes('\n')) {
+				this.open('hashtag', hashtag);
+				opened = true;
+			}
+		}
+
+		if (isEmoji || opened == false) {
 			const emoji = text.substr(emojiIndex + 1);
 			if (emoji != '' && emoji.match(/^[\+\-a-z0-9_]+$/)) {
 				this.open('emoji', emoji);
@@ -164,13 +188,31 @@ class Autocomplete {
 			const trimmedBefore = before.substring(0, before.lastIndexOf('@'));
 			const after = source.substr(caret);
 
+			const acct = renderAcct(value);
+
 			// 挿入
-			this.text = trimmedBefore + '@' + value.username + ' ' + after;
+			this.text = trimmedBefore + '@' + acct + ' ' + after;
 
 			// キャレットを戻す
 			this.vm.$nextTick(() => {
 				this.textarea.focus();
-				const pos = trimmedBefore.length + (value.username.length + 2);
+				const pos = trimmedBefore.length + (acct.length + 2);
+				this.textarea.setSelectionRange(pos, pos);
+			});
+		} else if (type == 'hashtag') {
+			const source = this.text;
+
+			const before = source.substr(0, caret);
+			const trimmedBefore = before.substring(0, before.lastIndexOf('#'));
+			const after = source.substr(caret);
+
+			// 挿入
+			this.text = trimmedBefore + '#' + value + ' ' + after;
+
+			// キャレットを戻す
+			this.vm.$nextTick(() => {
+				this.textarea.focus();
+				const pos = trimmedBefore.length + (value.length + 2);
 				this.textarea.setSelectionRange(pos, pos);
 			});
 		} else if (type == 'emoji') {

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

@@ -1,8 +1,8 @@
 <template>
 <div class="mkw-analog-clock">
-	<mk-widget-container :naked="props.naked" :show-header="false">
+	<mk-widget-container :naked="!(props.design % 2)" :show-header="false">
 		<div class="mkw-analog-clock--body">
-			<mk-analog-clock :dark="$store.state.device.darkmode"/>
+			<mk-analog-clock :dark="$store.state.device.darkmode" :smooth="!(props.design && ~props.design)"/>
 		</div>
 	</mk-widget-container>
 </div>
@@ -13,12 +13,13 @@ import define from '../../../common/define-widget';
 export default define({
 	name: 'analog-clock',
 	props: () => ({
-		naked: false
+		design: -1
 	})
 }).extend({
 	methods: {
 		func() {
-			this.props.naked = !this.props.naked;
+			if (++this.props.design > 2)
+				this.props.design = -1;
 			this.save();
 		}
 	}

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

@@ -175,6 +175,7 @@ root(isDark)
 					> .val
 						height 4px
 						background $theme-color
+						transition width .3s cubic-bezier(0.23, 1, 0.32, 1)
 
 				&:nth-child(1)
 					> .meter > .val

src/client/app/common/views/widgets/photo-stream.vue

@@ -5,7 +5,7 @@
 
 		<p :class="$style.fetching" v-if="fetching">%fa:spinner .pulse .fw%%i18n:common.loading%<mk-ellipsis/></p>
 		<div :class="$style.stream" v-if="!fetching && images.length > 0">
-			<div v-for="image in images" :class="$style.img" :style="`background-image: url(${image.url}?thumbnail&size=256)`"></div>
+			<div v-for="image in images" :class="$style.img" :style="`background-image: url(${image.url})`"></div>
 		</div>
 		<p :class="$style.empty" v-if="!fetching && images.length == 0">%i18n:@no-photos%</p>
 	</mk-widget-container>

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

@@ -72,7 +72,7 @@ export default define({
 			if (this.images.length == 0) return;
 
 			const index = Math.floor(Math.random() * this.images.length);
-			const img = `url(${ this.images[index].url }?thumbnail&size=1024)`;
+			const img = `url(${ this.images[index].url })`;
 
 			(this.$refs.slideB as any).style.backgroundImage = img;
 

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

@@ -35,10 +35,7 @@ import Vue from 'vue';
 const eachMonthDays = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
 
 function isLeapYear(year) {
-	return (year % 400 == 0) ? true :
-		(year % 100 == 0) ? false :
-			(year % 4 == 0) ? true :
-				false;
+	return !(year % (year % 25 ? 4 : 16));
 }
 
 export default Vue.extend({

src/client/app/desktop/views/components/choose-file-from-drive-window.vue

@@ -28,7 +28,7 @@ export default Vue.extend({
 			default: false
 		},
 		title: {
-			default: '%fa:R file%%i18n:@choose-prompt%s'
+			default: '%fa:R file%%i18n:@choose-prompt%'
 		}
 	},
 	data() {

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

@@ -1,5 +1,5 @@
 <template>
-<div class="root file"
+<div class="gvfdktuvdgwhmztnuekzkswkjygptfcv"
 	:data-is-selected="isSelected"
 	:data-is-contextmenu-showing="isContextmenuShowing"
 	@click="onClick"
@@ -16,7 +16,7 @@
 		<p>%i18n:@banner%</p>
 	</div>
 	<div class="thumbnail" ref="thumbnail" :style="`background-color: ${ background }`">
-		<img :src="`${file.url}?thumbnail&size=128`" alt="" @load="onThumbnailLoaded"/>
+		<img :src="file.url" alt="" @load="onThumbnailLoaded"/>
 	</div>
 	<p class="name">
 		<span>{{ file.name.lastIndexOf('.') != -1 ? file.name.substr(0, file.name.lastIndexOf('.')) : file.name }}</span>
@@ -68,6 +68,11 @@ export default Vue.extend({
 				icon: '%fa:i-cursor%',
 				action: this.rename
 			}, {
+				type: 'item',
+				text: this.file.isSensitive ? '%i18n:@contextmenu.unmark-as-sensitive%' : '%i18n:@contextmenu.mark-as-sensitive%',
+				icon: this.file.isSensitive ? '%fa:R eye%' : '%fa:R eye-slash%',
+				action: this.toggleSensitive
+			}, null, {
 				type: 'item',
 				text: '%i18n:@contextmenu.copy-url%',
 				icon: '%fa:link%',
@@ -149,6 +154,13 @@ export default Vue.extend({
 			});
 		},
 
+		toggleSensitive() {
+			(this as any).api('drive/files/update', {
+				fileId: this.file.id,
+				isSensitive: !this.file.isSensitive
+			});
+		},
+
 		copyUrl() {
 			copyToClipboard(this.file.url);
 			(this as any).apis.dialog({
@@ -312,10 +324,10 @@ root(isDark)
 		> .ext
 			opacity 0.5
 
-.root.file[data-darkmode]
+.gvfdktuvdgwhmztnuekzkswkjygptfcv[data-darkmode]
 	root(true)
 
-.root.file:not([data-darkmode])
+.gvfdktuvdgwhmztnuekzkswkjygptfcv:not([data-darkmode])
 	root(false)
 
 </style>

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

@@ -1,5 +1,5 @@
 <template>
-<div class="root folder"
+<div class="ynntpczxvnusfwdyxsfuhvcmuypqopdd"
 	:data-is-contextmenu-showing="isContextmenuShowing"
 	:data-draghover="draghover"
 	@click="onClick"
@@ -216,10 +216,10 @@ export default Vue.extend({
 <style lang="stylus" scoped>
 @import '~const.styl'
 
-.root.folder
+root(isDark)
 	padding 8px
 	height 64px
-	background lighten($theme-color, 95%)
+	background isDark ? rgba($theme-color, 0.2) : lighten($theme-color, 95%)
 	border-radius 4px
 
 	&, *
@@ -229,10 +229,10 @@ export default Vue.extend({
 		pointer-events none
 
 	&:hover
-		background lighten($theme-color, 90%)
+		background isDark ? rgba(lighten($theme-color, 10%), 0.2) : lighten($theme-color, 90%)
 
 	&:active
-		background lighten($theme-color, 85%)
+		background isDark ? rgba(darken($theme-color, 10%), 0.2) : lighten($theme-color, 85%)
 
 	&[data-is-contextmenu-showing]
 	&[data-draghover]
@@ -248,16 +248,22 @@ export default Vue.extend({
 			border-radius 4px
 
 	&[data-draghover]
-		background lighten($theme-color, 90%)
+		background isDark ? rgba(darken($theme-color, 10%), 0.2) : lighten($theme-color, 90%)
 
 	> .name
 		margin 0
 		font-size 0.9em
-		color darken($theme-color, 30%)
+		color isDark ? #fff : darken($theme-color, 30%)
 
 		> [data-fa]
 			margin-right 4px
 			margin-left 2px
 			text-align left
 
+.ynntpczxvnusfwdyxsfuhvcmuypqopdd[data-darkmode]
+	root(true)
+
+.ynntpczxvnusfwdyxsfuhvcmuypqopdd:not([data-darkmode])
+	root(false)
+
 </style>

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

@@ -10,7 +10,10 @@
 			<span class="separator" v-if="folder != null">%fa:angle-right%</span>
 			<span class="folder current" v-if="folder != null">{{ folder.name }}</span>
 		</div>
-		<input class="search" type="search" placeholder="&#xf002; %i18n:@search%"/>
+		<!--
+			TODO: #343
+			<input class="search" type="search" placeholder="&#xf002; %i18n:@search%"/>
+		-->
 	</nav>
 	<div class="main" :class="{ uploading: uploadings.length > 0, fetching }"
 		ref="main"

src/client/app/desktop/views/components/followers-window.vue

@@ -1,7 +1,7 @@
 <template>
 <mk-window width="400px" height="550px" @closed="$destroy">
 	<span slot="header" :class="$style.header">
-		<img :src="`${user.avatarUrl}?thumbnail&size=64`" alt=""/>{{ '%i18n:@followers%'.replace('{}', name) }}
+		<img :src="user.avatarUrl" alt=""/>{{ '%i18n:@followers%'.replace('{}', name) }}
 	</span>
 	<mk-followers :user="user"/>
 </mk-window>

src/client/app/desktop/views/components/following-window.vue

@@ -1,7 +1,7 @@
 <template>
 <mk-window width="400px" height="550px" @closed="$destroy">
 	<span slot="header" :class="$style.header">
-		<img :src="`${user.avatarUrl}?thumbnail&size=64`" alt=""/>{{ '%i18n:@following%'.replace('{}', name) }}
+		<img :src="user.avatarUrl" alt=""/>{{ '%i18n:@following%'.replace('{}', name) }}
 	</span>
 	<mk-following :user="user"/>
 </mk-window>

src/client/app/desktop/views/components/media-image.vue

@@ -1,5 +1,11 @@
 <template>
-<a class="mk-media-image"
+<div class="ldwbgwstjsdgcjruamauqdrffetqudry" v-if="image.isSensitive && hide" @click="hide = false">
+	<div>
+		<b>%fa:exclamation-triangle% %i18n:@sensitive%</b>
+		<span>%i18n:@click-to-show%</span>
+	</div>
+</div>
+<a class="lcjomzwbohoelkxsnuqjiaccdbdfiazy" v-else
 	:href="image.url"
 	@mousemove="onMousemove"
 	@mouseleave="onMouseleave"
@@ -21,13 +27,17 @@ export default Vue.extend({
 		},
 		raw: {
 			default: false
+		},
+		hide: {
+			type: Boolean,
+			default: true
 		}
 	},
 	computed: {
 		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}?thumbnail&size=512)`
+				'background-image': this.raw ? `url(${this.image.url})` : `url(${this.image.url})`
 			};
 		}
 	},
@@ -56,16 +66,30 @@ export default Vue.extend({
 </script>
 
 <style lang="stylus" scoped>
-.mk-media-image
+.lcjomzwbohoelkxsnuqjiaccdbdfiazy
 	display block
 	cursor zoom-in
 	overflow hidden
 	width 100%
 	height 100%
 	background-position center
-	border-radius 4px
 
 	&:not(:hover)
 		background-size cover
 
+.ldwbgwstjsdgcjruamauqdrffetqudry
+	display flex
+	justify-content center
+	align-items center
+	background #111
+	color #fff
+
+	> div
+		display table-cell
+		text-align center
+		font-size 12px
+
+		> b
+			display block
+
 </style>

src/client/app/desktop/views/components/media-video.vue

@@ -1,12 +1,19 @@
 <template>
-	<video class="mk-media-video"
+<div class="uofhebxjdgksfmltszlxurtjnjjsvioh" v-if="video.isSensitive && hide" @click="hide = false">
+	<div>
+		<b>%fa:exclamation-triangle% %i18n:@sensitive%</b>
+		<span>%i18n:@click-to-show%</span>
+	</div>
+</div>
+<div class="vwxdhznewyashiknzolsoihtlpicqepe" v-else>
+	<video class="video"
 		:src="video.url"
 		:title="video.name"
 		controls
 		@dblclick.prevent="onClick"
 		ref="video"
 		v-if="inlinePlayable" />
-	<a class="mk-media-video-thumbnail"
+	<a class="thumbnail"
 		:href="video.url"
 		:style="imageStyle"
 		@click.prevent="onClick"
@@ -14,6 +21,7 @@
 		v-else>
 		%fa:R play-circle%
 	</a>
+</div>
 </template>
 
 <script lang="ts">
@@ -21,11 +29,23 @@ import Vue from 'vue';
 import MkMediaVideoDialog from './media-video-dialog.vue';
 
 export default Vue.extend({
-	props: ['video', 'inlinePlayable'],
+	props: {
+		video: {
+			type: Object,
+			required: true
+		},
+		inlinePlayable: {
+			default: false
+		},
+		hide: {
+			type: Boolean,
+			default: true
+		}
+	},
 	computed: {
 		imageStyle(): any {
 			return {
-				'background-image': `url(${this.video.url}?thumbnail&size=512)`
+				'background-image': `url(${this.video.url})`
 			};
 		}
 	},
@@ -47,22 +67,39 @@ export default Vue.extend({
 </script>
 
 <style lang="stylus" scoped>
-.mk-media-video
-	display block
-	width 100%
-	height 100%
-	border-radius 4px
+.vwxdhznewyashiknzolsoihtlpicqepe
+	.video
+		display block
+		width 100%
+		height 100%
+		border-radius 4px
 
-.mk-media-video-thumbnail
+	.thumbnail
+		display flex
+		justify-content center
+		align-items center
+		font-size 3.5em
+
+		cursor zoom-in
+		overflow hidden
+		background-position center
+		background-size cover
+		width 100%
+		height 100%
+
+.uofhebxjdgksfmltszlxurtjnjjsvioh
 	display flex
 	justify-content center
 	align-items center
-	font-size 3.5em
+	background #111
+	color #fff
+
+	> div
+		display table-cell
+		text-align center
+		font-size 12px
+
+		> b
+			display block
 
-	cursor zoom-in
-	overflow hidden
-	background-position center
-	background-size cover
-	width 100%
-	height 100%
 </style>

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

@@ -56,10 +56,10 @@
 				<button @click="menu" ref="menuButton">
 					%fa:ellipsis-h%
 				</button>
-				<button title="%i18n:@detail">
+				<!-- <button title="%i18n:@detail">
 					<template v-if="!isDetailOpened">%fa:caret-down%</template>
 					<template v-if="isDetailOpened">%fa:caret-up%</template>
-				</button>
+				</button> -->
 			</footer>
 		</div>
 	</article>

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

@@ -10,6 +10,10 @@
 			<span v-for="u in visibleUsers">{{ u | userName }}<a @click="removeVisibleUser(u)">[x]</a></span>
 			<a @click="addVisibleUser">+ユーザーを追加</a>
 		</div>
+		<div class="hashtags" v-if="recentHashtags.length > 0">
+			<b>%i18n:@recent-tags%:</b>
+			<a v-for="tag in recentHashtags.slice(0, 5)" @click="addTag(tag)" title="%@click-to-tagging%">#{{ tag }}</a>
+		</div>
 		<input v-show="useCw" v-model="cw" placeholder="内容への注釈 (オプション)">
 		<textarea :class="{ with: (files.length != 0 || poll) }"
 			ref="text" v-model="text" :disabled="posting"
@@ -19,7 +23,7 @@
 		<div class="medias" :class="{ with: poll }" v-show="files.length != 0">
 			<x-draggable :list="files" :options="{ animation: 150 }">
 				<div v-for="file in files" :key="file.id">
-					<div class="img" :style="{ backgroundImage: `url(${file.url}?thumbnail&size=64)` }" :title="file.name"></div>
+					<div class="img" :style="{ backgroundImage: `url(${file.url})` }" :title="file.name"></div>
 					<img class="remove" @click="detachMedia(file.id)" src="/assets/desktop/remove.png" title="%i18n:@attach-cancel%" alt=""/>
 				</div>
 			</x-draggable>
@@ -46,6 +50,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
+import insertTextAtCursor from 'insert-text-at-cursor';
 import * as XDraggable from 'vuedraggable';
 import getKao from '../../../common/scripts/get-kao';
 import MkVisibilityChooser from '../../../common/views/components/visibility-chooser.vue';
@@ -91,7 +96,8 @@ export default Vue.extend({
 			visibility: 'public',
 			visibleUsers: [],
 			autocomplete: null,
-			draghover: false
+			draghover: false,
+			recentHashtags: JSON.parse(localStorage.getItem('hashtags') || '[]')
 		};
 	},
 
@@ -131,7 +137,9 @@ export default Vue.extend({
 		},
 
 		canPost(): boolean {
-			return !this.posting && (this.text.length != 0 || this.files.length != 0 || this.poll || this.renote);
+			return !this.posting &&
+				(1 <= this.text.length || 1 <= this.files.length || this.poll || this.renote) &&
+				(this.text.trim().length <= 1000);
 		}
 	},
 
@@ -183,6 +191,10 @@ export default Vue.extend({
 	},
 
 	methods: {
+		addTag(tag: string) {
+			insertTextAtCursor(this.$refs.text, ` #${tag} `);
+		},
+
 		watch() {
 			this.$watch('text', () => this.saveDraft());
 			this.$watch('poll', () => this.saveDraft());
@@ -235,7 +247,7 @@ export default Vue.extend({
 		},
 
 		onKeydown(e) {
-			if ((e.which == 10 || e.which == 13) && (e.ctrlKey || e.metaKey)) this.post();
+			if ((e.which == 10 || e.which == 13) && (e.ctrlKey || e.metaKey) && this.canPost) this.post();
 		},
 
 		onPaste(e) {
@@ -297,8 +309,8 @@ export default Vue.extend({
 			}, err => {
 				alert('エラー: ' + err.message);
 			}, {
-				enableHighAccuracy: true
-			});
+					enableHighAccuracy: true
+				});
 		},
 
 		removeGeo() {
@@ -370,6 +382,12 @@ export default Vue.extend({
 			}).then(() => {
 				this.posting = false;
 			});
+
+			if (this.text && this.text != '') {
+				const hashtags = parse(this.text).filter(x => x.type == 'hashtag').map(x => x.hashtag);
+				const history = JSON.parse(localStorage.getItem('hashtags') || '[]') as string[];
+				localStorage.setItem('hashtags', JSON.stringify(hashtags.concat(history).reduce((a, c) => a.includes(c) ? a : [...a, c], [])));
+			}
 		},
 
 		saveDraft() {
@@ -452,7 +470,7 @@ root(isDark)
 			margin 0
 			max-width 100%
 			min-width 100%
-			min-height 64px
+			min-height 84px
 
 			&:hover
 				& + *
@@ -478,6 +496,19 @@ root(isDark)
 				margin-right 16px
 				color isDark ? #fff : #666
 
+		> .hashtags
+			margin 0 0 8px 0
+			overflow hidden
+			white-space nowrap
+			font-size 14px
+
+			> b
+				color isDark ? #9baec8 : darken($theme-color, 20%)
+
+			> *
+				margin-right 8px
+				white-space nowrap
+
 		> .medias
 			margin 0
 			padding 0

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

@@ -2,7 +2,7 @@
 <div class="profile">
 	<label class="avatar ui from group">
 		<p>%i18n:@avatar%</p>
-		<img class="avatar" :src="`${$store.state.i.avatarUrl}?thumbnail&size=64`" alt="avatar"/>
+		<img class="avatar" :src="$store.state.i.avatarUrl" alt="avatar"/>
 		<button class="ui" @click="updateAvatar">%i18n:@choice-avatar%</button>
 	</label>
 	<label class="ui from group">

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

@@ -2,13 +2,13 @@
 <div class="nav">
 	<ul>
 		<template v-if="$store.getters.isSignedIn">
-			<li class="home" :class="{ active: $route.name == 'index' }">
+			<li class="home" :class="{ active: $route.name == 'index' }" @click="goToTop">
 				<router-link to="/">
 					%fa:home%
 					<p>%i18n:@home%</p>
 				</router-link>
 			</li>
-			<li class="deck" :class="{ active: $route.name == 'deck' }">
+			<li class="deck" :class="{ active: $route.name == 'deck' }" @click="goToTop">
 				<router-link to="/deck">
 					%fa:columns%
 					<p>%i18n:@deck% <small>(beta)</small></p>
@@ -82,6 +82,14 @@ export default Vue.extend({
 
 		game() {
 			(this as any).os.new(MkGameWindow);
+		},
+
+		goToTop(e: HTMLElement) {
+			if (e.classList.contains('active'))
+				window.scrollTo({
+					top: 0,
+					behavior: 'smooth'
+				});
 		}
 	}
 });

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

@@ -9,6 +9,9 @@
 				<div class="left">
 					<x-nav/>
 				</div>
+				<div class="center">
+					<div class="icon" @click="goToTop"></div>
+				</div>
 				<div class="right">
 					<x-search/>
 					<x-account v-if="$store.getters.isSignedIn"/>
@@ -42,6 +45,14 @@ export default Vue.extend({
 		XPost,
 		XClock,
 	},
+	methods: {
+		goToTop() {
+			window.scrollTo({
+				top: 0,
+				behavior: 'smooth'
+			});
+		}
+	},
 	mounted() {
 		this.$store.commit('setUiHeaderHeight', 48);
 
@@ -142,26 +153,24 @@ root(isDark)
 				max-width 1300px
 				margin 0 auto
 
-				&:before
-					content ""
-					position absolute
-					top 0
-					left 0
-					display block
-					width 100%
-					height 48px
-					background-image isDark ? url('/assets/desktop/header-icon.dark.svg') : url('/assets/desktop/header-icon.light.svg')
-					background-size 24px
-					background-position center
-					background-repeat no-repeat
-					opacity 0.3
+				> .center
+					margin auto
+
+					> .icon
+						display block
+						width 48px
+						height 48px
+						background-image isDark ? url('/assets/desktop/header-icon.dark.svg') : url('/assets/desktop/header-icon.light.svg')
+						background-size 24px
+						background-position center
+						background-repeat no-repeat
+						opacity 0.3
+						cursor pointer
 
 				> .left
-					margin 0 auto 0 0
 					height 48px
 
 				> .right
-					margin 0 0 0 auto
 					height 48px
 
 					> *

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

@@ -1,7 +1,7 @@
 <template>
 <div class="mk-user-preview">
 	<template v-if="u != null">
-		<div class="banner" :style="u.bannerUrl ? `background-image: url(${u.bannerUrl}?thumbnail&size=512)` : ''"></div>
+		<div class="banner" :style="u.bannerUrl ? `background-image: url(${u.bannerUrl})` : ''"></div>
 		<mk-avatar class="avatar" :user="u" :disable-preview="true"/>
 		<div class="title">
 			<router-link class="name" :to="u | userPage">{{ u | userName }}</router-link>

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

@@ -6,6 +6,7 @@
 	<div :class="$style.loading" v-if="fetching">
 		<mk-ellipsis-icon/>
 	</div>
+	<p :class="$style.notAvailable" v-if="!fetching && notAvailable">検索機能を利用することができません。</p>
 	<p :class="$style.empty" v-if="!fetching && empty">%fa:search%「{{ q }}」に関する投稿は見つかりませんでした。</p>
 	<mk-notes ref="timeline" :class="$style.notes" :more="existMore ? more : null"/>
 </mk-ui>
@@ -24,7 +25,8 @@ export default Vue.extend({
 			moreFetching: false,
 			existMore: false,
 			offset: 0,
-			empty: false
+			empty: false,
+			notAvailable: false
 		};
 	},
 	watch: {
@@ -71,7 +73,11 @@ export default Vue.extend({
 					res(notes);
 					this.fetching = false;
 					Progress.done();
-				}, rej);
+				}, (e: string) => {
+					this.fetching = false;
+					Progress.done();
+					if (e === 'searching not available') this.notAvailable = true;
+				});
 			}));
 		},
 		more() {
@@ -130,4 +136,18 @@ export default Vue.extend({
 		font-size 3em
 		color #ccc
 
+
+.notAvailable
+	display block
+	margin 0 auto
+	padding 32px
+	max-width 400px
+	text-align center
+	color #999
+
+	> [data-fa]
+		display block
+		margin-bottom 16px
+		font-size 3em
+		color #ccc
 </style>

src/client/app/desktop/views/pages/user-list.users.vue

@@ -49,7 +49,8 @@ export default Vue.extend({
 		add() {
 			(this as any).apis.input({
 				title: '%i18n:@username%',
-			}).then(async username => {
+			}).then(async (username: string) => {
+				if (username.startsWith('@')) username = username.slice(1);
 				const user = await (this as any).api('users/show', {
 					username
 				});

src/client/app/desktop/views/pages/user/user.followers-you-know.vue

@@ -4,7 +4,7 @@
 	<p class="initializing" v-if="fetching">%fa:spinner .pulse .fw%%i18n:@loading%<mk-ellipsis/></p>
 	<div v-if="!fetching && users.length > 0">
 	<router-link v-for="user in users" :to="user | userPage" :key="user.id">
-		<img :src="`${user.avatarUrl}?thumbnail&size=64`" :alt="user | userName" v-user-preview="user.id"/>
+		<img :src="user.avatarUrl" :alt="user | userName" v-user-preview="user.id"/>
 	</router-link>
 	</div>
 	<p class="empty" v-if="!fetching && users.length == 0">%i18n:@no-users%</p>

src/client/app/desktop/views/pages/user/user.photos.vue

@@ -4,7 +4,7 @@
 	<p class="initializing" v-if="fetching">%fa:spinner .pulse .fw%%i18n:@loading%<mk-ellipsis/></p>
 	<div class="stream" v-if="!fetching && images.length > 0">
 		<div v-for="image in images" class="img"
-			:style="`background-image: url(${image.url}?thumbnail&size=256)`"
+			:style="`background-image: url(${image.url})`"
 		></div>
 	</div>
 	<p class="empty" v-if="!fetching && images.length == 0">%i18n:@no-photos%</p>

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

@@ -2,7 +2,7 @@
 <div class="mkw-notifications">
 	<mk-widget-container :show-header="!props.compact">
 		<template slot="header">%fa:R bell%%i18n:@title%</template>
-		<button slot="func" title="%i18n:@settings%" @click="settings">%fa:cog%</button>
+		<!-- <button slot="func" title="%i18n:@settings%" @click="settings">%fa:cog%</button> -->
 
 		<mk-notifications :class="$style.notifications"/>
 	</mk-widget-container>

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

@@ -45,7 +45,7 @@ export default define({
 			this.save();
 		},
 		onKeydown(e) {
-			if ((e.which == 10 || e.which == 13) && (e.ctrlKey || e.metaKey)) this.post();
+			if ((e.which == 10 || e.which == 13) && (e.ctrlKey || e.metaKey) && !this.posting && this.text) this.post();
 		},
 		post() {
 			this.posting = true;

src/client/app/desktop/views/widgets/profile.vue

@@ -4,7 +4,7 @@
 	:data-melt="props.design == 2"
 >
 	<div class="banner"
-		:style="$store.state.i.bannerUrl ? `background-image: url(${$store.state.i.bannerUrl}?thumbnail&size=256)` : ''"
+		:style="$store.state.i.bannerUrl ? `background-image: url(${$store.state.i.bannerUrl})` : ''"
 		title="%i18n:@update-banner%"
 		@click="os.apis.updateBanner"
 	></div>

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}?thumbnail&size=128)`
+				'background-image': `url(${this.file.url})`
 			};
 		}
 	},

src/client/app/mobile/views/components/media-image.vue

@@ -1,5 +1,11 @@
 <template>
-<a class="mk-media-image" :href="image.url" target="_blank" :style="style" :title="image.name"></a>
+<div class="qjewsnkgzzxlxtzncydssfbgjibiehcy" v-if="image.isSensitive && hide" @click="hide = false">
+	<div>
+		<b>%fa:exclamation-triangle% %i18n:@sensitive%</b>
+		<span>%i18n:@click-to-show%</span>
+	</div>
+</div>
+<a class="gqnyydlzavusgskkfvwvjiattxdzsqlf" v-else :href="image.url" target="_blank" :style="style" :title="image.name"></a>
 </template>
 
 <script lang="ts">
@@ -13,11 +19,15 @@ export default Vue.extend({
 		},
 		raw: {
 			default: false
+		},
+		hide: {
+			type: Boolean,
+			default: true
 		}
 	},
 	computed: {
 		style(): any {
-			let url = `url(${this.image.url}?thumbnail)`;
+			let url = `url(${this.image.url})`;
 
 			if (this.$store.state.device.loadRemoteMedia || this.$store.state.device.lightmode) {
 				url = null;
@@ -35,13 +45,27 @@ export default Vue.extend({
 </script>
 
 <style lang="stylus" scoped>
-.mk-media-image
+.gqnyydlzavusgskkfvwvjiattxdzsqlf
 	display block
 	overflow hidden
 	width 100%
 	height 100%
 	background-position center
 	background-size cover
-	border-radius 4px
+
+.qjewsnkgzzxlxtzncydssfbgjibiehcy
+	display flex
+	justify-content center
+	align-items center
+	background #111
+	color #fff
+
+	> div
+		display table-cell
+		text-align center
+		font-size 12px
+
+		> b
+			display block
 
 </style>

src/client/app/mobile/views/components/media-video.vue

@@ -1,28 +1,43 @@
 <template>
-	<a class="mk-media-video"
-		:href="video.url"
-		target="_blank"
-		:style="imageStyle"
-		:title="video.name">
-		%fa:R play-circle%
-	</a>
+<div class="icozogqfvdetwohsdglrbswgrejoxbdj" v-if="video.isSensitive && hide" @click="hide = false">
+	<div>
+		<b>%fa:exclamation-triangle% %i18n:@sensitive%</b>
+		<span>%i18n:@click-to-show%</span>
+	</div>
+</div>
+<a class="kkjnbbplepmiyuadieoenjgutgcmtsvu" v-else
+	:href="video.url"
+	target="_blank"
+	:style="imageStyle"
+	:title="video.name">
+	%fa:R play-circle%
+</a>
 </template>
 
 <script lang="ts">
 import Vue from 'vue'
 export default Vue.extend({
-	props: ['video'],
+	props: {
+		video: {
+			type: Object,
+			required: true
+		},
+		hide: {
+			type: Boolean,
+			default: true
+		}
+	},
 	computed: {
 		imageStyle(): any {
 			return {
-				'background-image': `url(${this.video.url}?thumbnail&size=512)`
+				'background-image': `url(${this.video.url})`
 			};
 		}
 	},})
 </script>
 
 <style lang="stylus" scoped>
-.mk-media-video
+.kkjnbbplepmiyuadieoenjgutgcmtsvu
 	display flex
 	justify-content center
 	align-items center
@@ -33,4 +48,20 @@ export default Vue.extend({
 	background-size cover
 	width 100%
 	height 100%
+
+.icozogqfvdetwohsdglrbswgrejoxbdj
+	display flex
+	justify-content center
+	align-items center
+	background #111
+	color #fff
+
+	> div
+		display table-cell
+		text-align center
+		font-size 12px
+
+		> b
+			display block
+
 </style>

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

@@ -2,7 +2,7 @@
 <div class="mk-note-card">
 	<a :href="note | notePage">
 		<header>
-			<img :src="`${note.user.avatarUrl}?thumbnail&size=64`" alt="avatar"/><h3>{{ note.user | userName }}</h3>
+			<img :src="note.user.avatarUrl" alt="avatar"/><h3>{{ note.user | userName }}</h3>
 		</header>
 		<div>
 			{{ text }}

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

@@ -1,47 +1,53 @@
 <template>
 <div class="mk-post-form">
-	<header>
-		<button class="cancel" @click="cancel">%fa:times%</button>
-		<div>
-			<span class="text-count" :class="{ over: text.length > 1000 }">{{ 1000 - text.length }}</span>
-			<span class="geo" v-if="geo">%fa:map-marker-alt%</span>
-			<button class="submit" :disabled="!canPost" @click="post">{{ submitText }}</button>
-		</div>
-	</header>
 	<div class="form">
-		<mk-note-preview v-if="reply" :note="reply"/>
-		<mk-note-preview v-if="renote" :note="renote"/>
-		<div v-if="visibility == 'specified'" class="visibleUsers">
-			<span v-for="u in visibleUsers">{{ u | userName }}<a @click="removeVisibleUser(u)">[x]</a></span>
-			<a @click="addVisibleUser">+%i18n:@add-visible-user%</a>
+		<header>
+			<button class="cancel" @click="cancel">%fa:times%</button>
+			<div>
+				<span class="text-count" :class="{ over: text.length > 1000 }">{{ 1000 - text.length }}</span>
+				<span class="geo" v-if="geo">%fa:map-marker-alt%</span>
+				<button class="submit" :disabled="!canPost" @click="post">{{ submitText }}</button>
+			</div>
+		</header>
+		<div class="form">
+			<mk-note-preview v-if="reply" :note="reply"/>
+			<mk-note-preview v-if="renote" :note="renote"/>
+			<div v-if="visibility == 'specified'" class="visibleUsers">
+				<span v-for="u in visibleUsers">{{ u | userName }}<a @click="removeVisibleUser(u)">[x]</a></span>
+				<a @click="addVisibleUser">+%i18n:@add-visible-user%</a>
+			</div>
+			<input v-show="useCw" v-model="cw" placeholder="%i18n:@cw-placeholder%">
+			<textarea v-model="text" ref="text" :disabled="posting" :placeholder="placeholder" v-autocomplete="'text'"></textarea>
+			<div class="attaches" v-show="files.length != 0">
+				<x-draggable class="files" :list="files" :options="{ animation: 150 }">
+					<div class="file" v-for="file in files" :key="file.id">
+						<div class="img" :style="`background-image: url(${file.url})`" @click="detachMedia(file)"></div>
+					</div>
+				</x-draggable>
+			</div>
+			<mk-poll-editor v-if="poll" ref="poll" @destroyed="poll = false"/>
+			<mk-uploader ref="uploader" @uploaded="attachMedia" @change="onChangeUploadings"/>
+			<footer>
+				<button class="upload" @click="chooseFile">%fa:upload%</button>
+				<button class="drive" @click="chooseFileFromDrive">%fa:cloud%</button>
+				<button class="kao" @click="kao">%fa:R smile%</button>
+				<button class="poll" @click="poll = true">%fa:chart-pie%</button>
+				<button class="poll" @click="useCw = !useCw">%fa:eye-slash%</button>
+				<button class="geo" @click="geo ? removeGeo() : setGeo()">%fa:map-marker-alt%</button>
+				<button class="visibility" @click="setVisibility" ref="visibilityButton">%fa:lock%</button>
+			</footer>
+			<input ref="file" class="file" type="file" accept="image/*" multiple="multiple" @change="onChangeFile"/>
 		</div>
-		<input v-show="useCw" v-model="cw" placeholder="%i18n:@cw-placeholder%">
-		<textarea v-model="text" ref="text" :disabled="posting" :placeholder="placeholder"></textarea>
-		<div class="attaches" v-show="files.length != 0">
-			<x-draggable class="files" :list="files" :options="{ animation: 150 }">
-				<div class="file" v-for="file in files" :key="file.id">
-					<div class="img" :style="`background-image: url(${file.url}?thumbnail&size=128)`" @click="detachMedia(file)"></div>
-				</div>
-			</x-draggable>
-		</div>
-		<mk-poll-editor v-if="poll" ref="poll" @destroyed="poll = false"/>
-		<mk-uploader ref="uploader" @uploaded="attachMedia" @change="onChangeUploadings"/>
-		<footer>
-			<button class="upload" @click="chooseFile">%fa:upload%</button>
-			<button class="drive" @click="chooseFileFromDrive">%fa:cloud%</button>
-			<button class="kao" @click="kao">%fa:R smile%</button>
-			<button class="poll" @click="poll = true">%fa:chart-pie%</button>
-			<button class="poll" @click="useCw = !useCw">%fa:eye-slash%</button>
-			<button class="geo" @click="geo ? removeGeo() : setGeo()">%fa:map-marker-alt%</button>
-			<button class="visibility" @click="setVisibility" ref="visibilityButton">%fa:lock%</button>
-		</footer>
-		<input ref="file" class="file" type="file" accept="image/*" multiple="multiple" @change="onChangeFile"/>
+	</div>
+	<div class="hashtags" v-if="recentHashtags.length > 0">
+		<a v-for="tag in recentHashtags.slice(0, 5)" @click="addTag(tag)">#{{ tag }}</a>
 	</div>
 </div>
 </template>
 
 <script lang="ts">
 import Vue from 'vue';
+import insertTextAtCursor from 'insert-text-at-cursor';
 import * as XDraggable from 'vuedraggable';
 import MkVisibilityChooser from '../../../common/views/components/visibility-chooser.vue';
 import getKao from '../../../common/scripts/get-kao';
@@ -85,7 +91,8 @@ export default Vue.extend({
 			visibility: 'public',
 			visibleUsers: [],
 			useCw: false,
-			cw: null
+			cw: null,
+			recentHashtags: JSON.parse(localStorage.getItem('hashtags') || '[]')
 		};
 	},
 
@@ -125,7 +132,9 @@ export default Vue.extend({
 		},
 
 		canPost(): boolean {
-			return !this.posting && (this.text.length != 0 || this.files.length != 0 || this.poll || this.renote);
+			return !this.posting &&
+				(1 <= this.text.length || 1 <= this.files.length || this.poll || this.renote) &&
+				(this.text.trim().length <= 1000);
 		}
 	},
 
@@ -161,6 +170,10 @@ export default Vue.extend({
 	},
 
 	methods: {
+		addTag(tag: string) {
+			insertTextAtCursor(this.$refs.text, ` #${tag} `);
+		},
+
 		focus() {
 			(this.$refs.text as any).focus();
 		},
@@ -210,8 +223,8 @@ export default Vue.extend({
 			}, err => {
 				alert('%i18n:@error%: ' + err.message);
 			}, {
-				enableHighAccuracy: true
-			});
+					enableHighAccuracy: true
+				});
 		},
 
 		removeGeo() {
@@ -281,6 +294,12 @@ export default Vue.extend({
 			}).catch(err => {
 				this.posting = false;
 			});
+
+			if (this.text && this.text != '') {
+				const hashtags = parse(this.text).filter(x => x.type == 'hashtag').map(x => x.hashtag);
+				const history = JSON.parse(localStorage.getItem('hashtags') || '[]') as string[];
+				localStorage.setItem('hashtags', JSON.stringify(hashtags.concat(history).reduce((a, c) => a.includes(c) ? a : [...a, c], [])));
+			}
 		},
 
 		cancel() {
@@ -302,146 +321,156 @@ root(isDark)
 	max-width 500px
 	width calc(100% - 16px)
 	margin 8px auto
-	background isDark ? #282C37 : #fff
-	border-radius 8px
-	box-shadow 0 0 2px rgba(#000, 0.1)
 
 	@media (min-width 500px)
 		margin 16px auto
 		width calc(100% - 32px)
-		box-shadow 0 8px 32px rgba(#000, 0.1)
+
+		> .form
+			box-shadow 0 8px 32px rgba(#000, 0.1)
 
 	@media (min-width 600px)
 		margin 32px auto
 
-	> header
-		z-index 1000
-		height 50px
-		box-shadow 0 1px 0 0 isDark ? rgba(#000, 0.2) : rgba(#000, 0.1)
-
-		> .cancel
-			padding 0
-			width 50px
-			line-height 50px
-			font-size 24px
-			color isDark ? #9baec8 : #555
-
-		> div
-			position absolute
-			top 0
-			right 0
-			color #657786
-
-			> .text-count
-				line-height 50px
-
-			> .geo
-				margin 0 8px
-				line-height 50px
-
-			> .submit
-				margin 8px
-				padding 0 16px
-				line-height 34px
-				vertical-align bottom
-				color $theme-color-foreground
-				background $theme-color
-				border-radius 4px
-
-				&:disabled
-					opacity 0.7
-
 	> .form
-		max-width 500px
-		margin 0 auto
+		background isDark ? #282C37 : #fff
+		border-radius 8px
+		box-shadow 0 0 2px rgba(#000, 0.1)
 
-		> .mk-note-preview
-			padding 16px
-
-		> .visibleUsers
-			margin-bottom 8px
-			font-size 14px
-
-			> span
-				margin-right 16px
-				color isDark ? #fff : #666
-
-		> input
-			z-index 1
-
-		> input
-		> textarea
-			display block
-			padding 12px
-			margin 0
-			width 100%
-			font-size 16px
-			color isDark ? #fff : #333
-			background isDark ? #191d23 : #fff
-			border none
-			border-radius 0
+		> header
+			z-index 1000
+			height 50px
 			box-shadow 0 1px 0 0 isDark ? rgba(#000, 0.2) : rgba(#000, 0.1)
 
-			&:disabled
-				opacity 0.5
-
-		> textarea
-			max-width 100%
-			min-width 100%
-			min-height 80px
-
-		> .attaches
-
-			> .files
-				display block
-				margin 0
-				padding 4px
-				list-style none
-
-				&:after
-					content ""
-					display block
-					clear both
-
-				> .file
-					display block
-					float left
-					margin 0
-					padding 0
-					border solid 4px transparent
-
-					> .img
-						width 64px
-						height 64px
-						background-size cover
-						background-position center center
-
-		> .mk-uploader
-			margin 8px 0 0 0
-			padding 8px
-
-		> .file
-			display none
-
-		> footer
-			white-space nowrap
-			overflow auto
-			-webkit-overflow-scrolling touch
-			overflow-scrolling touch
-
-			> *
-				display inline-block
+			> .cancel
 				padding 0
-				margin 0
-				width 48px
-				height 48px
-				font-size 20px
+				width 50px
+				line-height 50px
+				font-size 24px
+				color isDark ? #9baec8 : #555
+
+			> div
+				position absolute
+				top 0
+				right 0
 				color #657786
-				background transparent
-				outline none
+
+				> .text-count
+					line-height 50px
+
+				> .geo
+					margin 0 8px
+					line-height 50px
+
+				> .submit
+					margin 8px
+					padding 0 16px
+					line-height 34px
+					vertical-align bottom
+					color $theme-color-foreground
+					background $theme-color
+					border-radius 4px
+
+					&:disabled
+						opacity 0.7
+
+		> .form
+			max-width 500px
+			margin 0 auto
+
+			> .mk-note-preview
+				padding 16px
+
+			> .visibleUsers
+				margin-bottom 8px
+				font-size 14px
+
+				> span
+					margin-right 16px
+					color isDark ? #fff : #666
+
+			> input
+				z-index 1
+
+			> input
+			> textarea
+				display block
+				padding 12px
+				margin 0
+				width 100%
+				font-size 16px
+				color isDark ? #fff : #333
+				background isDark ? #191d23 : #fff
 				border none
 				border-radius 0
-				box-shadow none
+				box-shadow 0 1px 0 0 isDark ? rgba(#000, 0.2) : rgba(#000, 0.1)
+
+				&:disabled
+					opacity 0.5
+
+			> textarea
+				max-width 100%
+				min-width 100%
+				min-height 80px
+
+			> .attaches
+
+				> .files
+					display block
+					margin 0
+					padding 4px
+					list-style none
+
+					&:after
+						content ""
+						display block
+						clear both
+
+					> .file
+						display block
+						float left
+						margin 0
+						padding 0
+						border solid 4px transparent
+
+						> .img
+							width 64px
+							height 64px
+							background-size cover
+							background-position center center
+
+			> .mk-uploader
+				margin 8px 0 0 0
+				padding 8px
+
+			> .file
+				display none
+
+			> footer
+				white-space nowrap
+				overflow auto
+				-webkit-overflow-scrolling touch
+				overflow-scrolling touch
+
+				> *
+					display inline-block
+					padding 0
+					margin 0
+					width 48px
+					height 48px
+					font-size 20px
+					color #657786
+					background transparent
+					outline none
+					border none
+					border-radius 0
+					box-shadow none
+
+	> .hashtags
+		margin 8px
+
+		> *
+			margin-right 8px
 
 .mk-post-form[data-darkmode]
 	root(true)

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

@@ -10,7 +10,7 @@
 	<transition name="nav">
 		<div class="body" v-if="isOpen">
 			<router-link class="me" v-if="$store.getters.isSignedIn" :to="`/@${$store.state.i.username}`">
-				<img class="avatar" :src="`${$store.state.i.avatarUrl}?thumbnail&size=128`" alt="avatar"/>
+				<img class="avatar" :src="$store.state.i.avatarUrl" alt="avatar"/>
 				<p class="name">{{ $store.state.i | userName }}</p>
 			</router-link>
 			<div class="links">

src/client/app/mobile/views/components/user-card.vue

@@ -1,6 +1,6 @@
 <template>
 <div class="mk-user-card">
-	<header :style="user.bannerUrl ? `background-image: url(${user.bannerUrl}?thumbnail&size=1024)` : ''">
+	<header :style="user.bannerUrl ? `background-image: url(${user.bannerUrl})` : ''">
 		<mk-avatar class="avatar" :user="user"/>
 	</header>
 	<a class="name" :href="user | userPage" target="_blank">{{ user | userName }}</a>

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

@@ -1,7 +1,7 @@
 <template>
 <mk-ui>
 	<template slot="header" v-if="!fetching">
-		<img :src="`${user.avatarUrl}?thumbnail&size=64`" alt="">
+		<img :src="user.avatarUrl" alt="">
 		{{ '%i18n:@followers-of%'.replace('{}', name) }}
 	</template>
 	<mk-users-list

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

@@ -1,7 +1,7 @@
 <template>
 <mk-ui>
 	<template slot="header" v-if="!fetching">
-		<img :src="`${user.avatarUrl}?thumbnail&size=64`" alt="">
+		<img :src="user.avatarUrl" alt="">
 		{{ '%i18n:@following-of%'.replace('{}', name) }}
 	</template>
 	<mk-users-list

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

@@ -24,7 +24,7 @@ export default Vue.extend({
 			const ok = window.confirm('%i18n:@read-all%');
 			if (!ok) return;
 
-			(this as any).api('notifications/mark_as_read_all');
+			(this as any).api('notifications/mark_all_as_read');
 		},
 		onFetched() {
 			Progress.done();

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

@@ -1,6 +1,6 @@
 <template>
 <mk-ui>
-	<template slot="header" v-if="!fetching"><img :src="`${user.avatarUrl}?thumbnail&size=64`" alt="">{{ user | userName }}</template>
+	<template slot="header" v-if="!fetching"><img :src="user.avatarUrl" alt="">{{ user | userName }}</template>
 	<main v-if="!fetching" :data-darkmode="$store.state.device.darkmode">
 		<div class="is-suspended" v-if="user.isSuspended"><p>%fa:exclamation-triangle% %i18n:@is-suspended%</p></div>
 		<div class="is-remote" v-if="user.host != null"><p>%fa:exclamation-triangle% %i18n:@is-remote%<a :href="user.url || user.uri" target="_blank">%i18n:@view-remote%</a></p></div>

src/client/app/mobile/views/pages/user/home.followers-you-know.vue

@@ -3,7 +3,7 @@
 	<p class="initializing" v-if="fetching">%fa:spinner .pulse .fw%%i18n:@loading%<mk-ellipsis/></p>
 	<div v-if="!fetching && users.length > 0">
 		<a v-for="user in users" :key="user.id" :href="user | userPage">
-			<img :src="`${user.avatarUrl}?thumbnail&size=64`" :alt="user | userName"/>
+			<img :src="user.avatarUrl" :alt="user | userName"/>
 		</a>
 	</div>
 	<p class="empty" v-if="!fetching && users.length == 0">%i18n:@no-users%</p>

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

@@ -4,7 +4,7 @@
 	<div class="stream" v-if="!fetching && images.length > 0">
 		<a v-for="image in images"
 			class="img"
-			:style="`background-image: url(${image.media.url}?thumbnail&size=256)`"
+			:style="`background-image: url(${image.media.url})`"
 			:href="image.note | notePage"
 		></a>
 	</div>

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

@@ -2,10 +2,10 @@
 <div class="mkw-profile">
 	<mk-widget-container>
 		<div :class="$style.banner"
-			:style="$store.state.i.bannerUrl ? `background-image: url(${$store.state.i.bannerUrl}?thumbnail&size=256)` : ''"
+			:style="$store.state.i.bannerUrl ? `background-image: url(${$store.state.i.bannerUrl})` : ''"
 		></div>
 		<img :class="$style.avatar"
-			:src="`${$store.state.i.avatarUrl}?thumbnail&size=96`"
+			:src="$store.state.i.avatarUrl"
 			alt="avatar"
 		/>
 		<router-link :class="$style.name" :to="$store.state.i | userPage">{{ $store.state.i | userName }}</router-link>

src/config/load.ts

@@ -44,6 +44,9 @@ export default function load() {
 	mixin.status_url = `${mixin.scheme}://${mixin.host}/status`;
 	mixin.drive_url = `${mixin.scheme}://${mixin.host}/files`;
 
+	if (config.localDriveCapacityMb == null) config.localDriveCapacityMb = 256;
+	if (config.remoteDriveCapacityMb == null) config.remoteDriveCapacityMb = 8;
+
 	return Object.assign(config, mixin);
 }
 

src/config/types.ts

@@ -40,13 +40,22 @@ export type Source = {
 		port: number;
 		pass: string;
 	};
-	recaptcha: {
+	recaptcha?: {
 		site_key: string;
 		secret_key: string;
 	};
 
+	localDriveCapacityMb: number;
+	remoteDriveCapacityMb: number;
 	preventCacheRemoteFiles: boolean;
 
+	drive?: {
+		storage: string;
+		bucket?: string;
+		prefix?: string;
+		config?: any;
+	};
+
 	/**
 	 * ゴーストアカウントのID
 	 */

src/docs/api/endpoints/style.styl

@@ -6,12 +6,14 @@
 	color #fff
 	background #222e40
 	border-radius 4px
+	overflow auto
+	white-space nowrap
 
 	> .method
 		display inline-block
 		margin 0 8px 0 0
 		padding 0 6px
-		color #f4fcff
+		color #fff
 		background #17afc7
 		border-radius 4px
 		user-select none

src/docs/api/endpoints/view.pug

@@ -5,7 +5,7 @@ block meta
 	link(rel="stylesheet" href="/docs/assets/api/endpoints/style.css")
 
 block main
-	h1= endpoint
+	h1= title
 
 	p#url
 		span.method POST
@@ -14,25 +14,63 @@ block main
 			| /
 		span.path= url.path
 
-	p#desc= desc[lang] || desc['ja']
+	if endpoint.desc
+		p#desc= endpoint.desc[lang] || endpoint.desc['ja']
 
-	section
-		h2= i18n('docs.api.endpoints.params')
-		+propTable(params)
+	if endpoint.requireCredential
+		div.ui.info: p
+			i.fas.fa-id-card-alt(style="margin-right: 4px")
+			= i18n('docs.api.endpoints.require-credential')
 
-		if paramDefs
-			each paramDef in paramDefs
-				section(id= paramDef.name)
-					h3= paramDef.name
-					+propTable(paramDef.params)
+		if endpoint.kind
+			div.ui.info: p
+				i.fas.fa-unlock-alt(style="margin-right: 4px")
+				!= i18n('docs.api.endpoints.require-permission').replace('{permission}', `<code>${endpoint.kind}</code>`)
+
+	if endpoint.limit
+		div.ui.info.warn: p
+			i.far.fa-clock(style="margin-right: 4px")
+			b!= i18n('docs.api.endpoints.has-limit')
+			if endpoint.limit.duration
+				!= i18n('docs.api.endpoints.duration-limit').replace('{duration}', endpoint.limit.duration).replace('{max}', endpoint.limit.max)
+			if endpoint.limit.minInterval
+				!= i18n('docs.api.endpoints.min-interval-limit').replace('{interval}', endpoint.limit.minInterval)
+
+	if params && Object.keys(params).length > 0
+		section
+			h2= i18n('docs.api.endpoints.params')
+			+propTable(params)
+
+			if paramDefs
+				each paramDef in paramDefs
+					section(id= paramDef.name)
+						h3= paramDef.name
+						+propTable(paramDef.params)
+	if params && Object.keys(params).length == 0
+		section
+			h2= i18n('docs.api.endpoints.params')
+			p= i18n('docs.api.endpoints.no-params')
 
 	if res
 		section
 			h2= i18n('docs.api.endpoints.res')
-			+propTable(res)
 
-			if resDefs
-				each resDef in resDefs
-					section(id= resDef.name)
-						h3= resDef.name
-						+propTable(resDef.props)
+			if resProps
+				+propTable(resProps)
+
+				if resDefs
+					each resDef in resDefs
+						section(id= resDef.name)
+							h3= resDef.name
+							+propTable(resDef.props)
+			else
+				if res.type.startsWith('entity')
+					a(href=`/docs/${lang}/api/entities/${kebab(res.entity)}`)= res.entity
+
+block footer
+	div.ui.info: p
+		i.fas.fa-info-circle(style="margin-right: 4px")
+		= i18n('docs.api.endpoints.generated')
+	p
+		= i18n('docs.api.endpoints.show-src')
+		a(href=src target="_blank")= i18n('docs.api.endpoints.show-src-link')

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

@@ -5,69 +5,86 @@ desc:
   en: "A file of Drive."
 
 props:
-  - name: "id"
+  id:
     type: "id"
     optional: false
     desc:
       ja: "ファイルID"
       en: "The ID of this file"
-  - name: "createdAt"
+
+  createdAt:
     type: "date"
     optional: false
     desc:
       ja: "アップロード日時"
       en: "The upload date of this file"
-  - name: "userId"
+
+  userId:
     type: "id(User)"
     optional: false
     desc:
       ja: "所有者ID"
       en: "The ID of the owner of this file"
-  - name: "user"
+
+  user:
     type: "entity(User)"
     optional: true
     desc:
       ja: "所有者"
       en: "The owner of this file"
-  - name: "name"
+
+  name:
     type: "string"
     optional: false
     desc:
       ja: "ファイル名"
       en: "The name of this file"
-  - name: "md5"
+
+  md5:
     type: "string"
     optional: false
     desc:
       ja: "ファイルのMD5ハッシュ値"
       en: "The md5 hash value of this file"
-  - name: "type"
+
+  type:
     type: "string"
     optional: false
     desc:
       ja: "ファイルの種類"
       en: "The type of this file"
-  - name: "datasize"
+
+  datasize:
     type: "number"
     optional: false
     desc:
       ja: "ファイルサイズ(bytes)"
       en: "The size of this file (bytes)"
-  - name: "url"
+
+  url:
     type: "string"
     optional: false
     desc:
       ja: "ファイルのURL"
       en: "The URL of this file"
-  - name: "folderId"
+
+  folderId:
     type: "id(DriveFolder)"
     optional: true
     desc:
       ja: "フォルダID"
       en: "The ID of the folder of this file"
-  - name: "folder"
+
+  folder:
     type: "entity(DriveFolder)"
     optional: true
     desc:
       ja: "フォルダ"
       en: "The folder of this file"
+
+  sensitive:
+    type: "boolean"
+    optional: true
+    desc:
+      ja: "このメディアが「閲覧注意」(NSFW)かどうか"
+      en: "Whether this media is NSFW"

src/docs/api/entities/note.yaml

@@ -5,163 +5,185 @@ desc:
   en: "A note."
 
 props:
-  - name: "id"
+  id:
     type: "id"
     optional: false
     desc:
       ja: "投稿ID"
       en: "The ID of this note"
-  - name: "createdAt"
+
+  createdAt:
     type: "date"
     optional: false
     desc:
       ja: "投稿日時"
       en: "The posted date of this note"
-  - name: "viaMobile"
+
+  viaMobile:
     type: "boolean"
     optional: true
     desc:
       ja: "モバイル端末から投稿したか否か(自己申告であることに留意)"
       en: "Whether this note sent via a mobile device"
-  - name: "text"
+
+  text:
     type: "string"
     optional: true
     desc:
       ja: "投稿の本文"
       en: "The text of this note"
-  - name: "mediaIds"
+
+  mediaIds:
     type: "id(DriveFile)[]"
     optional: true
     desc:
       ja: "添付されているメディアのID (なければレスポンスでは空配列)"
       en: "The IDs of the attached media (empty array for response if no media is attached)"
-  - name: "media"
+
+  media:
     type: "entity(DriveFile)[]"
     optional: true
     desc:
       ja: "添付されているメディア"
       en: "The attached media"
-  - name: "userId"
+
+  userId:
     type: "id(User)"
     optional: false
     desc:
       ja: "投稿者ID"
       en: "The ID of author of this note"
-  - name: "user"
+
+  user:
     type: "entity(User)"
     optional: true
     desc:
       ja: "投稿者"
       en: "The author of this note"
-  - name: "myReaction"
+
+  myReaction:
     type: "string"
     optional: true
     desc:
       ja: "この投稿に対する自分の<a href='/docs/api/reactions'>リアクション</a>"
       en: "The your <a href='/docs/api/reactions'>reaction</a> of this note"
-  - name: "reactionCounts"
+
+  reactionCounts:
     type: "object"
     optional: false
     desc:
       ja: "<a href='/docs/api/reactions'>リアクション</a>をキーとし、この投稿に対するそのリアクションの数を値としたオブジェクト"
-  - name: "replyId"
+
+  replyId:
     type: "id(Note)"
     optional: true
     desc:
       ja: "返信した投稿のID"
       en: "The ID of the replyed note"
-  - name: "reply"
+
+  reply:
     type: "entity(Note)"
     optional: true
     desc:
       ja: "返信した投稿"
       en: "The replyed note"
-  - name: "renoteId"
+
+  renoteId:
     type: "id(Note)"
     optional: true
     desc:
       ja: "引用した投稿のID"
       en: "The ID of the quoted note"
-  - name: "renote"
+
+  renote:
     type: "entity(Note)"
     optional: true
     desc:
       ja: "引用した投稿"
       en: "The quoted note"
-  - name: "poll"
+
+  poll:
     type: "object"
     optional: true
     desc:
       ja: "投票"
       en: "The poll"
-    defName: "poll"
-    def:
-      - name: "choices"
+
+    props:
+      choices:
         type: "object[]"
         optional: false
         desc:
           ja: "投票の選択肢"
           en: "The choices of this poll"
-        defName: "choice"
-        def:
-          - name: "id"
+
+        props:
+          id:
             type: "number"
             optional: false
             desc:
               ja: "選択肢ID"
               en: "The ID of this choice"
-          - name: "isVoted"
+
+          isVoted:
             type: "boolean"
             optional: true
             desc:
               ja: "自分がこの選択肢に投票したかどうか"
               en: "Whether you voted to this choice"
-          - name: "text"
+
+          text:
             type: "string"
             optional: false
             desc:
               ja: "選択肢本文"
               en: "The text of this choice"
-          - name: "votes"
+
+          votes:
             type: "number"
             optional: false
             desc:
               ja: "この選択肢に投票された数"
               en: "The number voted for this choice"
-  - name: "geo"
+  geo:
     type: "object"
     optional: true
     desc:
       ja: "位置情報"
       en: "Geo location"
-    defName: "geo"
-    def:
-      - name: "coordinates"
+
+    props:
+      coordinates:
         type: "number[]"
         optional: false
         desc:
           ja: "座標。最初に経度：-180〜180で表す。最後に緯度：-90〜90で表す。"
-      - name: "altitude"
+
+      altitude:
         type: "number"
         optional: false
         desc:
           ja: "高度。メートル単位で表す。"
-      - name: "accuracy"
+
+      accuracy:
         type: "number"
         optional: false
         desc:
           ja: "緯度、経度の精度。メートル単位で表す。"
-      - name: "altitudeAccuracy"
+
+      altitudeAccuracy:
         type: "number"
         optional: false
         desc:
           ja: "高度の精度。メートル単位で表す。"
-      - name: "heading"
+
+      heading:
         type: "number"
         optional: false
         desc:
           ja: "方角。0〜360の角度で表す。0が北、90が東、180が南、270が西。"
-      - name: "speed"
+
+      speed:
         type: "number"
         optional: false
         desc:

src/docs/api/entities/post.yaml

@@ -1,168 +0,0 @@
-name: "Note"
-
-desc:
-  ja: "投稿。"
-  en: "A note."
-
-props:
-  - name: "id"
-    type: "id"
-    optional: false
-    desc:
-      ja: "投稿ID"
-      en: "The ID of this note"
-  - name: "createdAt"
-    type: "date"
-    optional: false
-    desc:
-      ja: "投稿日時"
-      en: "The posted date of this note"
-  - name: "viaMobile"
-    type: "boolean"
-    optional: true
-    desc:
-      ja: "モバイル端末から投稿したか否か(自己申告であることに留意)"
-      en: "Whether this note sent via a mobile device"
-  - name: "text"
-    type: "string"
-    optional: true
-    desc:
-      ja: "投稿の本文 (ローカルの場合Markdown風のフォーマット)"
-      en: "The text of this note (in Markdown like format if local)"
-  - name: "mediaIds"
-    type: "id(DriveFile)[]"
-    optional: true
-    desc:
-      ja: "添付されているメディアのID (なければレスポンスでは空配列)"
-      en: "The IDs of the attached media (empty array for response if no media is attached)"
-  - name: "media"
-    type: "entity(DriveFile)[]"
-    optional: true
-    desc:
-      ja: "添付されているメディア"
-      en: "The attached media"
-  - name: "userId"
-    type: "id(User)"
-    optional: false
-    desc:
-      ja: "投稿者ID"
-      en: "The ID of author of this note"
-  - name: "user"
-    type: "entity(User)"
-    optional: true
-    desc:
-      ja: "投稿者"
-      en: "The author of this note"
-  - name: "myReaction"
-    type: "string"
-    optional: true
-    desc:
-      ja: "この投稿に対する自分の<a href='/docs/api/reactions'>リアクション</a>"
-      en: "The your <a href='/docs/api/reactions'>reaction</a> of this note"
-  - name: "reactionCounts"
-    type: "object"
-    optional: false
-    desc:
-      ja: "<a href='/docs/api/reactions'>リアクション</a>をキーとし、この投稿に対するそのリアクションの数を値としたオブジェクト"
-  - name: "replyId"
-    type: "id(Note)"
-    optional: true
-    desc:
-      ja: "返信した投稿のID"
-      en: "The ID of the replyed note"
-  - name: "reply"
-    type: "entity(Note)"
-    optional: true
-    desc:
-      ja: "返信した投稿"
-      en: "The replyed note"
-  - name: "renoteId"
-    type: "id(Note)"
-    optional: true
-    desc:
-      ja: "引用した投稿のID"
-      en: "The ID of the quoted note"
-  - name: "renote"
-    type: "entity(Note)"
-    optional: true
-    desc:
-      ja: "引用した投稿"
-      en: "The quoted note"
-  - name: "poll"
-    type: "object"
-    optional: true
-    desc:
-      ja: "投票"
-      en: "The poll"
-    defName: "poll"
-    def:
-      - name: "choices"
-        type: "object[]"
-        optional: false
-        desc:
-          ja: "投票の選択肢"
-          en: "The choices of this poll"
-        defName: "choice"
-        def:
-          - name: "id"
-            type: "number"
-            optional: false
-            desc:
-              ja: "選択肢ID"
-              en: "The ID of this choice"
-          - name: "isVoted"
-            type: "boolean"
-            optional: true
-            desc:
-              ja: "自分がこの選択肢に投票したかどうか"
-              en: "Whether you voted to this choice"
-          - name: "text"
-            type: "string"
-            optional: false
-            desc:
-              ja: "選択肢本文"
-              en: "The text of this choice"
-          - name: "votes"
-            type: "number"
-            optional: false
-            desc:
-              ja: "この選択肢に投票された数"
-              en: "The number voted for this choice"
-  - name: "geo"
-    type: "object"
-    optional: true
-    desc:
-      ja: "位置情報"
-      en: "Geo location"
-    defName: "geo"
-    def:
-      - name: "coordinates"
-        type: "number[]"
-        optional: false
-        desc:
-          ja: "座標。最初に経度：-180〜180で表す。最後に緯度：-90〜90で表す。"
-      - name: "altitude"
-        type: "number"
-        optional: false
-        desc:
-          ja: "高度。メートル単位で表す。"
-      - name: "accuracy"
-        type: "number"
-        optional: false
-        desc:
-          ja: "緯度、経度の精度。メートル単位で表す。"
-      - name: "altitudeAccuracy"
-        type: "number"
-        optional: false
-        desc:
-          ja: "高度の精度。メートル単位で表す。"
-      - name: "heading"
-        type: "number"
-        optional: false
-        desc:
-          ja: "方角。0〜360の角度で表す。0が北、90が東、180が南、270が西。"
-      - name: "speed"
-        type: "number"
-        optional: false
-        desc:
-          ja: "速度。メートル / 秒数で表す。"