4.26.0

New Crowdin translations

.config/example.yml

@@ -41,10 +41,6 @@ redis:
   port: 6379
   pass: example-pass
 
-recaptcha:
-  site_key: example-site-key
-  secret_key: example-secret-key
-
 # If enabled:
 #  Server will not cache remote files (Using direct link instead).
 #  You can save your storage.
@@ -67,6 +63,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

.github/ISSUE_TEMPLATE

@@ -1,7 +1,16 @@
 <!--
+Thanks for your contribution.
+
+When you report a bug or suggest a new feature, please include these information.
+* Your browser
+* Desktop version or mobile version
+
+--------
+
 Misskeyへの貢献ありがとうございます。
 
 バグの報告や提案などで、可能であれば以下の情報を含めてください。
 * お使いのブラウザ
 * デスクトップ版Misskeyかモバイル版Misskeyか
+
 -->

.npmrc

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

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.
@@ -44,9 +44,9 @@ If you want to...
 
 :heart: Backers & Sponsors
 ----------------------------------------------------------------
-| ![][nagarus-icon] | ![][dansup-icon] |
+| <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"> |
-|:-:|:-:|
+|:-:|:-:|:-:|
-| [nagarus][nagarus-link] | [dansup][dansup-link] |
+| [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 +73,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
-

docs/setup.en.md

@@ -48,9 +48,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 +63,12 @@ npm install web-push -g
 web-push generate-vapid-keys
 ```
 
-
+*5.* Make configuration file
-*6.* 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 +84,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.
 

docs/setup.ja.md

@@ -47,10 +47,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トークンを必要とします。
+reCAPTCHAを有効にする場合、reCAPTCHAトークンを取得する必要があります。
-https://www.google.com/recaptcha/intro/ にアクセスしてトークンを生成してください。
+https://www.google.com/recaptcha/intro/ にアクセスしてトークンを取得してください。
 
 *(オプション)* VAPIDキーペアの生成
 ----------------------------------------------------------------
@@ -61,12 +61,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 +81,7 @@ Debianをお使いであれば、`build-essential`パッケージをインスト
 3. `node-gyp build`
 4. `npm run build`
 
-
+*7.* 以上です！
-*6.* 以上です！
 ----------------------------------------------------------------
 お疲れ様でした。これでMisskeyを動かす準備は整いました。
 

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,12 +81,12 @@ gulp.task('lint', () =>
 );
 
 gulp.task('format', () =>
-gulp.src('./src/**/*.ts')
+	gulp.src('./src/**/*.ts')
-	.pipe(tslint({
+		.pipe(tslint({
-		formatter: 'verbose',
+			formatter: 'verbose',
-		fix: true
+			fix: true
-	}))
+		}))
-	.pipe(tslint.report())
+		.pipe(tslint.report())
 );
 
 gulp.task('mocha', () =>
@@ -117,8 +114,9 @@ gulp.task('build:client', [
 	'copy:client'
 ]);
 
-gulp.task('build:client:script', () =>
+gulp.task('build:client:script', () => {
-	gulp.src(['./src/client/app/boot.js', './src/client/app/safe.js'])
+	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

@@ -288,6 +288,8 @@ desktop/views/components/drive.file.vue:
   banner: "バナー"
   contextmenu:
     rename: "名前を変更"
+    mark-as-sensitive: "閲覧注意に設定"
+    unmark-as-sensitive: "閲覧注意を解除"
     copy-url: "URLをコピー"
     download: "ダウンロード"
     else-files: "その他..."
@@ -331,6 +333,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: "フォロー"
@@ -725,6 +733,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: "フォロー"

locales/de.yml

@@ -288,6 +288,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 +333,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"
@@ -725,6 +733,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: "フォロー"

locales/en.yml

@@ -288,6 +288,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 +333,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"
@@ -725,6 +733,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"

locales/es.yml

@@ -288,6 +288,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 +333,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"
@@ -725,6 +733,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: "フォロー"

locales/fr.yml

@@ -288,6 +288,8 @@ desktop/views/components/drive.file.vue:
   banner: "Bannière"
   contextmenu:
     rename: "Renommer"
+    mark-as-sensitive: "閲覧注意に設定"
+    unmark-as-sensitive: "閲覧注意を解除"
     copy-url: "Copier l'URL"
     download: "Télécharger"
     else-files: "Autres..."
@@ -331,6 +333,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: "クリックして表示"
+desktop/views/components/media-video.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
 desktop/views/components/follow-button.vue:
   following: "Abonnements"
   follow: "Suivre"
@@ -725,6 +733,12 @@ mobile/views/components/drive.file-detail.vue:
   move: "Déplacer"
   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: "Abonnements"
   follow: "Suivre"

locales/it.yml

@@ -288,6 +288,8 @@ desktop/views/components/drive.file.vue:
   banner: "バナー"
   contextmenu:
     rename: "名前を変更"
+    mark-as-sensitive: "閲覧注意に設定"
+    unmark-as-sensitive: "閲覧注意を解除"
     copy-url: "URLをコピー"
     download: "ダウンロード"
     else-files: "その他..."
@@ -331,6 +333,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: "フォロー"
@@ -725,6 +733,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: "フォロー"

locales/ja.yml

@@ -330,6 +330,8 @@ desktop/views/components/drive.file.vue:
   banner: "バナー"
   contextmenu:
     rename: "名前を変更"
+    mark-as-sensitive: "閲覧注意に設定"
+    unmark-as-sensitive: "閲覧注意を解除"
     copy-url: "URLをコピー"
     download: "ダウンロード"
     else-files: "その他..."
@@ -377,6 +379,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: "フォロー"
@@ -853,6 +863,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: "フォロー"

locales/ko.yml

@@ -288,6 +288,8 @@ desktop/views/components/drive.file.vue:
   banner: "バナー"
   contextmenu:
     rename: "名前を変更"
+    mark-as-sensitive: "閲覧注意に設定"
+    unmark-as-sensitive: "閲覧注意を解除"
     copy-url: "URLをコピー"
     download: "ダウンロード"
     else-files: "その他..."
@@ -331,6 +333,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: "フォロー"
@@ -725,6 +733,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: "フォロー"

locales/pl.yml

@@ -288,6 +288,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 +333,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ź"
@@ -725,6 +733,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ź"

locales/pt.yml

@@ -288,6 +288,8 @@ desktop/views/components/drive.file.vue:
   banner: "バナー"
   contextmenu:
     rename: "名前を変更"
+    mark-as-sensitive: "閲覧注意に設定"
+    unmark-as-sensitive: "閲覧注意を解除"
     copy-url: "URLをコピー"
     download: "ダウンロード"
     else-files: "その他..."
@@ -331,6 +333,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: "フォロー"
@@ -725,6 +733,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: "フォロー"

locales/ru.yml

@@ -288,6 +288,8 @@ desktop/views/components/drive.file.vue:
   banner: "バナー"
   contextmenu:
     rename: "名前を変更"
+    mark-as-sensitive: "閲覧注意に設定"
+    unmark-as-sensitive: "閲覧注意を解除"
     copy-url: "URLをコピー"
     download: "ダウンロード"
     else-files: "その他..."
@@ -331,6 +333,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: "フォロー"
@@ -725,6 +733,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: "フォロー"

locales/zh.yml

@@ -288,6 +288,8 @@ desktop/views/components/drive.file.vue:
   banner: "バナー"
   contextmenu:
     rename: "名前を変更"
+    mark-as-sensitive: "閲覧注意に設定"
+    unmark-as-sensitive: "閲覧注意を解除"
     copy-url: "URLをコピー"
     download: "ダウンロード"
     else-files: "その他..."
@@ -331,6 +333,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: "フォロー"
@@ -725,6 +733,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: "フォロー"

package.json

@@ -1,20 +1,18 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "4.22.1",
+	"version": "4.26.0",
-	"clientVersion": "1.0.7361",
+	"clientVersion": "1.0.7435",
 	"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",
@@ -100,7 +98,7 @@
 		"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",
@@ -128,6 +126,7 @@
 		"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",
@@ -188,7 +187,7 @@
 		"stylus": "0.54.5",
 		"stylus-loader": "3.0.2",
 		"summaly": "2.0.6",
-		"swagger-jsdoc": "1.9.7",
+		"swagger-jsdoc": "1.10.2",
 		"syuilo-password-strength": "0.0.1",
 		"textarea-caret": "3.1.0",
 		"tmp": "0.0.33",
@@ -205,8 +204,9 @@
 		"vue-cropperjs": "2.2.1",
 		"vue-js-modal": "1.3.16",
 		"vue-json-tree-view": "2.1.4",
-		"vue-loader": "15.2.5",
+		"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",
@@ -214,7 +214,7 @@
 		"web-push": "3.3.2",
 		"webfinger.js": "2.6.6",
 		"webpack": "4.16.1",
-		"webpack-cli": "3.0.8",
+		"webpack-cli": "3.1.0",
 		"websocket": "1.0.26",
 		"ws": "5.2.2",
 		"xev": "2.0.1"

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

@@ -39,6 +39,10 @@ export default Vue.extend({
 		dark: {
 			type: Boolean,
 			default: false
+		},
+		smooth: {
+			type: Boolean,
+			default: false
 		}
 	},
 
@@ -75,7 +79,7 @@ export default Vue.extend({
 		},
 
 		ms(): number {
-			return this.now.getMilliseconds();
+			return this.now.getMilliseconds() * this.smooth;
 		}
 		s(): number {
 			return this.now.getSeconds();

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

@@ -7,6 +7,11 @@
 			<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) {
-
+			this.$el.style.left = (window.innerWidth - this.$el.offsetWidth) + 'px';
-		if (this.x + this.$el.offsetWidth > window.innerWidth - margin) {
-			this.$el.style.left = (this.x - this.$el.offsetWidth) + 'px';
-			this.$el.style.marginLeft = '-16px';
 		} 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,7 +140,26 @@ 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') {
+				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') {
@@ -231,6 +259,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 +277,8 @@ root(isDark)
 		list-style none
 
 		> li
-			display block
+			display flex
+			align-items center
 			padding 4px 12px
 			white-space nowrap
 			overflow hidden
@@ -259,7 +289,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 +311,6 @@ root(isDark)
 	> .users > li
 
 		.avatar
-			vertical-align middle
 			min-width 28px
 			min-height 28px
 			max-width 28px
@@ -284,14 +319,18 @@ 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
+			margin 0 8px 0 0
+			color isDark ? rgba(#fff, 0.8) : rgba(#000, 0.8)
+
 	> .emojis > li
 
 		.emoji
@@ -300,11 +339,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/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.message.vue

@@ -4,9 +4,9 @@
 	<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">

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>
+	<div v-if="recaptchaSitekey != null" 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>
 	<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];
+		if (recaptchaSitekey != null) {
-		const script = document.createElement('script');
+			const head = document.getElementsByTagName('head')[0];
-		script.setAttribute('src', 'https://www.google.com/recaptcha/api.js');
+			const script = document.createElement('script');
-		head.appendChild(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/directives/autocomplete.ts

@@ -67,15 +67,27 @@ class Autocomplete {
 	 * テキスト入力時
 	 */
 	private onInput() {
-		const caret = this.textarea.selectionStart;
+		const caretPos = this.textarea.selectionStart;
-		const text = this.text.substr(0, caret);
+		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) 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 +95,15 @@ class Autocomplete {
 			}
 		}
 
-		if (emojiIndex != -1 && emojiIndex > mentionIndex) {
+		if (isHashtag || opened == false) {
+			const hashtag = text.substr(hashtagIndex + 1);
+			if (hashtag != '' && !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);
@@ -173,6 +193,22 @@ class Autocomplete {
 				const pos = trimmedBefore.length + (value.username.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') {
 			const source = this.text;
 

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/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 :
+	return !(year % (year % 25 ? 4 : 16));
-		(year % 100 == 0) ? false :
-			(year % 4 == 0) ? true :
-				false;
 }
 
 export default Vue.extend({

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

@@ -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({

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/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,6 +27,10 @@ export default Vue.extend({
 		},
 		raw: {
 			default: false
+		},
+		hide: {
+			type: Boolean,
+			default: true
 		}
 	},
 	computed: {
@@ -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,7 +29,19 @@ 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 {
@@ -47,22 +67,39 @@ export default Vue.extend({
 </script>
 
 <style lang="stylus" scoped>
-.mk-media-video
+.vwxdhznewyashiknzolsoihtlpicqepe
-	display block
+	.video
-	width 100%
+		display block
-	height 100%
+		width 100%
-	border-radius 4px
+		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,9 @@
 			<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">
+			<a v-for="tag in recentHashtags" @click="addTag(tag)">#{{ 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"
@@ -46,6 +49,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 +95,8 @@ export default Vue.extend({
 			visibility: 'public',
 			visibleUsers: [],
 			autocomplete: null,
-			draghover: false
+			draghover: false,
+			recentHashtags: JSON.parse(localStorage.getItem('hashtags') || '[]')
 		};
 	},
 
@@ -183,6 +188,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());
@@ -370,6 +379,13 @@ 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);
+				let history = JSON.parse(localStorage.getItem('hashtags') || '[]') as string[];
+				history = history.filter(x => !hashtags.includes(x));
+				localStorage.setItem('hashtags', JSON.stringify(hashtags.concat(history)));
+			}
 		},
 
 		saveDraft() {
@@ -478,6 +494,10 @@ root(isDark)
 				margin-right 16px
 				color isDark ? #fff : #666
 
+		> .hashtags
+			> *
+				margin-right 8px
+
 		> .medias
 			margin 0
 			padding 0

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/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/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,6 +19,10 @@ export default Vue.extend({
 		},
 		raw: {
 			default: false
+		},
+		hide: {
+			type: Boolean,
+			default: true
 		}
 	},
 	computed: {
@@ -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,17 +1,32 @@
 <template>
-	<a class="mk-media-video"
+<div class="icozogqfvdetwohsdglrbswgrejoxbdj" v-if="video.isSensitive && hide" @click="hide = false">
-		:href="video.url"
+	<div>
-		target="_blank"
+		<b>%fa:exclamation-triangle% %i18n:@sensitive%</b>
-		:style="imageStyle"
+		<span>%i18n:@click-to-show%</span>
-		:title="video.name">
+	</div>
-		%fa:R play-circle%
+</div>
-	</a>
+<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 {
@@ -22,7 +37,7 @@ export default Vue.extend({
 </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/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"/>
+		<header>
-		<mk-note-preview v-if="renote" :note="renote"/>
+			<button class="cancel" @click="cancel">%fa:times%</button>
-		<div v-if="visibility == 'specified'" class="visibleUsers">
+			<div>
-			<span v-for="u in visibleUsers">{{ u | userName }}<a @click="removeVisibleUser(u)">[x]</a></span>
+				<span class="text-count" :class="{ over: text.length > 1000 }">{{ 1000 - text.length }}</span>
-			<a @click="addVisibleUser">+%i18n:@add-visible-user%</a>
+				<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}?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>
-		<input v-show="useCw" v-model="cw" placeholder="%i18n:@cw-placeholder%">
+	</div>
-		<textarea v-model="text" ref="text" :disabled="posting" :placeholder="placeholder"></textarea>
+	<div class="hashtags" v-if="recentHashtags.length > 0">
-		<div class="attaches" v-show="files.length != 0">
+		<a v-for="tag in recentHashtags" @click="addTag(tag)">#{{ tag }}</a>
-			<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>
 </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') || '[]')
 		};
 	},
 
@@ -161,6 +168,10 @@ export default Vue.extend({
 	},
 
 	methods: {
+		addTag(tag: string) {
+			insertTextAtCursor(this.$refs.text, ` #${tag} `);
+		},
+
 		focus() {
 			(this.$refs.text as any).focus();
 		},
@@ -281,6 +292,13 @@ 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);
+				let history = JSON.parse(localStorage.getItem('hashtags') || '[]') as string[];
+				history = history.filter(x => !hashtags.includes(x));
+				localStorage.setItem('hashtags', JSON.stringify(hashtags.concat(history)));
+			}
 		},
 
 		cancel() {
@@ -302,146 +320,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
+		background isDark ? #282C37 : #fff
-		margin 0 auto
+		border-radius 8px
+		box-shadow 0 0 2px rgba(#000, 0.1)
 
-		> .mk-note-preview
+		> header
-			padding 16px
+			z-index 1000
-
+			height 50px
-		> .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 0 1px 0 0 isDark ? rgba(#000, 0.2) : rgba(#000, 0.1)
 
-			&:disabled
+			> .cancel
-				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 50px
-				width 48px
+				line-height 50px
-				height 48px
+				font-size 24px
-				font-size 20px
+				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/config/types.ts

@@ -40,7 +40,7 @@ export type Source = {
 		port: number;
 		pass: string;
 	};
-	recaptcha: {
+	recaptcha?: {
 		site_key: string;
 		secret_key: string;
 	};

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

@@ -81,3 +81,10 @@ props:
     desc:
       ja: "フォルダ"
       en: "The folder of this file"
+
+  sensitive:
+    type: "boolean"
+    optional: true
+    desc:
+      ja: "このメディアが「閲覧注意」(NSFW)かどうか"
+      en: "Whether this media is NSFW"

src/docs/style.styl

@@ -12,9 +12,6 @@ main
 	width 850px
 	max-width calc(100% - 330px)
 
-	section
-		margin 32px 0
-
 	h1
 		margin 0 0 24px 0
 		padding 16px 0
@@ -22,18 +19,18 @@ main
 		border-bottom solid 2px #eee
 
 	h2
-		margin 0 0 24px 0
+		margin 1em 0 24px 0
 		padding 0 0 16px 0
 		font-size 1.4em
 		border-bottom solid 1px #eee
 
 	h3
-		margin 0
+		margin 1em 0 0 0
 		padding 0
 		font-size 1.25em
 
 	h4
-		margin 0
+		margin 1em 0 0 0
 
 	p
 		margin 1em 0

src/models/drive-file.ts

@@ -33,6 +33,7 @@ export type IMetadata = {
 	url?: string;
 	deletedAt?: Date;
 	isMetaOnly?: boolean;
+	isSensitive?: boolean;
 };
 
 export type IDriveFile = {

src/models/hashtag.ts

@@ -0,0 +1,13 @@
+import * as mongo from 'mongodb';
+import db from '../db/mongodb';
+
+const Hashtag = db.get<IHashtags>('hashtags');
+Hashtag.createIndex('tag', { unique: true });
+Hashtag.createIndex('mentionedUserIdsCount');
+export default Hashtag;
+
+export interface IHashtags {
+	tag: string;
+	mentionedUserIds: mongo.ObjectID[];
+	mentionedUserIdsCount: number;
+}

src/models/user.ts

@@ -108,6 +108,7 @@ export interface ILocalUser extends IUserBase {
 
 export interface IRemoteUser extends IUserBase {
 	inbox: string;
+	sharedInbox?: string;
 	endpoints: string[];
 	uri: string;
 	url?: string;

src/remote/activitypub/models/image.ts

@@ -16,7 +16,7 @@ export async function createImage(actor: IRemoteUser, value: any): Promise<IDriv
 		return null;
 	}
 
-	const image = await new Resolver().resolve(value);
+	const image = await new Resolver().resolve(value) as any;
 
 	if (image.url == null) {
 		throw new Error('invalid image: url not privided');
@@ -24,7 +24,7 @@ export async function createImage(actor: IRemoteUser, value: any): Promise<IDriv
 
 	log(`Creating the Image: ${image.url}`);
 
-	return await uploadFromUrl(image.url, actor, null, image.url);
+	return await uploadFromUrl(image.url, actor, null, image.url, image.sensitive);
 }
 
 /**

src/remote/activitypub/models/person.ts

@@ -117,6 +117,7 @@ export async function createPerson(value: any, resolver?: Resolver): Promise<IUs
 				publicKeyPem: person.publicKey.publicKeyPem
 			},
 			inbox: person.inbox,
+			sharedInbox: person.sharedInbox,
 			endpoints: person.endpoints,
 			uri: person.id,
 			url: person.url,
@@ -239,6 +240,8 @@ export async function updatePerson(value: string | IObject, resolver?: Resolver)
 	await User.update({ _id: exist._id }, {
 		$set: {
 			updatedAt: new Date(),
+			inbox: person.inbox,
+			sharedInbox: person.sharedInbox,
 			avatarId: avatar ? avatar._id : null,
 			bannerId: banner ? banner._id : null,
 			avatarUrl: avatar && avatar.metadata.isMetaOnly ? avatar.metadata.url : null,

src/remote/activitypub/renderer/image.ts

@@ -1,7 +1,8 @@
 import config from '../../../config';
 import { IDriveFile } from '../../../models/drive-file';
 
-export default (fileId: IDriveFile['_id']) => ({
+export default (file: IDriveFile) => ({
 	type: 'Image',
-	url: `${config.drive_url}/${fileId}`
+	url: `${config.drive_url}/${file._id}`,
+	sensitive: file.metadata.isSensitive
 });

src/remote/activitypub/renderer/person.ts

@@ -4,10 +4,16 @@ import config from '../../../config';
 import { ILocalUser } from '../../../models/user';
 import toHtml from '../../../mfm/html';
 import parse from '../../../mfm/parse';
+import DriveFile from '../../../models/drive-file';
 
-export default (user: ILocalUser) => {
+export default async (user: ILocalUser) => {
 	const id = `${config.url}/users/${user._id}`;
 
+	const [avatar, banner] = await Promise.all([
+		DriveFile.findOne({ _id: user.avatarId }),
+		DriveFile.findOne({ _id: user.bannerId })
+	]);
+
 	return {
 		type: user.isBot ? 'Service' : 'Person',
 		id,
@@ -18,8 +24,8 @@ export default (user: ILocalUser) => {
 		preferredUsername: user.username,
 		name: user.name,
 		summary: toHtml(parse(user.description)),
-		icon: user.avatarId && renderImage(user.avatarId),
+		icon: user.avatarId && renderImage(avatar),
-		image: user.bannerId && renderImage(user.bannerId),
+		image: user.bannerId && renderImage(banner),
 		manuallyApprovesFollowers: user.isLocked,
 		publicKey: renderKey(user)
 	};

src/remote/activitypub/type.ts

@@ -47,6 +47,7 @@ export interface IPerson extends IObject {
 	preferredUsername: string;
 	manuallyApprovesFollowers: boolean;
 	inbox: string;
+	sharedInbox?: string;
 	publicKey: any;
 	followers: any;
 	following: any;

src/server/activitypub.ts

@@ -111,13 +111,13 @@ router.get('/users/:user/publickey', async ctx => {
 });
 
 // user
-function userInfo(ctx: Router.IRouterContext, user: IUser) {
+async function userInfo(ctx: Router.IRouterContext, user: IUser) {
 	if (user === null) {
 		ctx.status = 404;
 		return;
 	}
 
-	ctx.body = pack(renderPerson(user as ILocalUser));
+	ctx.body = pack(await renderPerson(user as ILocalUser));
 }
 
 router.get('/users/:user', async ctx => {
@@ -128,7 +128,7 @@ router.get('/users/:user', async ctx => {
 		host: null
 	});
 
-	userInfo(ctx, user);
+	await userInfo(ctx, user);
 });
 
 router.get('/@:user', async (ctx, next) => {
@@ -139,7 +139,7 @@ router.get('/@:user', async (ctx, next) => {
 		host: null
 	});
 
-	userInfo(ctx, user);
+	await userInfo(ctx, user);
 });
 //#endregion
 

src/server/api/call.ts

@@ -1,3 +1,4 @@
+import { performance } from 'perf_hooks';
 import limitter from './limitter';
 import { IUser } from '../../models/user';
 import { IApp } from '../../models/app';
@@ -45,7 +46,13 @@ export default (endpoint: string, user: IUser, app: IApp, data: any, file?: any)
 
 	// API invoking
 	try {
+		const a = performance.now();
 		res = await exec(data, user, app);
+		const b = performance.now();
+
+		if (b - a > 500) {
+			console.warn(`SLOW API CALL DETECTED: ${ep.name}`);
+		}
 	} catch (e) {
 		rej(e);
 		return;

src/server/api/endpoints/drive/files/create.ts

@@ -29,6 +29,14 @@ export const meta = {
 			desc: {
 				ja: 'フォルダID'
 			}
+		}),
+
+		isSensitive: $.bool.optional.note({
+			default: false,
+			desc: {
+				ja: 'このメディアが「閲覧注意」(NSFW)かどうか',
+				en: 'Whether this media is NSFW'
+			}
 		})
 	}
 };
@@ -68,7 +76,7 @@ export default async (file: any, params: any, user: ILocalUser): Promise<any> =>
 
 	try {
 		// Create file
-		const driveFile = await create(user, file.path, name, null, ps.folderId);
+		const driveFile = await create(user, file.path, name, null, ps.folderId, false, false, null, null, ps.isSensitive);
 
 		cleanup();
 

src/server/api/endpoints/drive/files/update.ts

@@ -3,6 +3,7 @@ import DriveFolder from '../../../../../models/drive-folder';
 import DriveFile, { validateFileName, pack } from '../../../../../models/drive-file';
 import { publishDriveStream } from '../../../../../stream';
 import { ILocalUser } from '../../../../../models/user';
+import getParams from '../../../get-params';
 
 export const meta = {
 	desc: {
@@ -12,18 +13,48 @@ export const meta = {
 
 	requireCredential: true,
 
-	kind: 'drive-write'
+	kind: 'drive-write',
+
+	params: {
+		fileId: $.type(ID).note({
+			desc: {
+				ja: '対象のファイルID'
+			}
+		}),
+
+		folderId: $.type(ID).optional.nullable.note({
+			default: undefined,
+			desc: {
+				ja: 'フォルダID'
+			}
+		}),
+
+		name: $.str.optional.pipe(validateFileName).note({
+			default: undefined,
+			desc: {
+				ja: 'ファイル名',
+				en: 'Name of the file'
+			}
+		}),
+
+		isSensitive: $.bool.optional.note({
+			default: undefined,
+			desc: {
+				ja: 'このメディアが「閲覧注意」(NSFW)かどうか',
+				en: 'Whether this media is NSFW'
+			}
+		})
+	}
 };
 
 export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
-	// Get 'fileId' parameter
+	const [ps, psErr] = getParams(meta, params);
-	const [fileId, fileIdErr] = $.type(ID).get(params.fileId);
+	if (psErr) return rej(psErr);
-	if (fileIdErr) return rej('invalid fileId param');
 
 	// Fetch file
 	const file = await DriveFile
 		.findOne({
-			_id: fileId,
+			_id: ps.fileId,
 			'metadata.userId': user._id
 		});
 
@@ -31,23 +62,18 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
 		return rej('file-not-found');
 	}
 
-	// Get 'name' parameter
+	if (ps.name) file.filename = ps.name;
-	const [name, nameErr] = $.str.optional.pipe(validateFileName).get(params.name);
-	if (nameErr) return rej('invalid name param');
-	if (name) file.filename = name;
 
-	// Get 'folderId' parameter
+	if (ps.isSensitive) file.metadata.isSensitive = ps.isSensitive;
-	const [folderId, folderIdErr] = $.type(ID).optional.nullable.get(params.folderId);
-	if (folderIdErr) return rej('invalid folderId param');
 
-	if (folderId !== undefined) {
+	if (ps.folderId !== undefined) {
-		if (folderId === null) {
+		if (ps.folderId === null) {
 			file.metadata.folderId = null;
 		} else {
 			// Fetch folder
 			const folder = await DriveFolder
 				.findOne({
-					_id: folderId,
+					_id: ps.folderId,
 					userId: user._id
 				});
 
@@ -62,7 +88,8 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
 	await DriveFile.update(file._id, {
 		$set: {
 			filename: file.filename,
-			'metadata.folderId': file.metadata.folderId
+			'metadata.folderId': file.metadata.folderId,
+			'metadata.isSensitive': file.metadata.isSensitive
 		}
 	});
 

src/server/api/endpoints/hashtags/search.ts

@@ -0,0 +1,52 @@
+import $ from 'cafy';
+import Hashtag from '../../../../models/hashtag';
+import getParams from '../../get-params';
+const escapeRegexp = require('escape-regexp');
+
+export const meta = {
+	desc: {
+		ja: 'ハッシュタグを検索します。'
+	},
+
+	requireCredential: false,
+
+	params: {
+		limit: $.num.optional.range(1, 100).note({
+			default: 10,
+			desc: {
+				ja: '最大数'
+			}
+		}),
+
+		query: $.str.note({
+			desc: {
+				ja: 'クエリ'
+			}
+		}),
+
+		offset: $.num.optional.min(0).note({
+			default: 0,
+			desc: {
+				ja: 'オフセット'
+			}
+		})
+	}
+};
+
+export default (params: any) => new Promise(async (res, rej) => {
+	const [ps, psErr] = getParams(meta, params);
+	if (psErr) throw psErr;
+
+	const hashtags = await Hashtag
+		.find({
+			tag: new RegExp('^' + escapeRegexp(ps.query.toLowerCase()))
+		}, {
+			sort: {
+				count: -1
+			},
+			limit: ps.limit,
+			skip: ps.offset
+		});
+
+	res(hashtags.map(tag => tag.tag));
+});

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

@@ -18,6 +18,8 @@ export default (params: any, me: ILocalUser) => new Promise(async (res, rej) =>
 	const [limit = 10, limitErr] = $.num.optional.range(1, 30).get(params.limit);
 	if (limitErr) return rej('invalid limit param');
 
+	if (es == null) return rej('searching not available');
+
 	es.search({
 		index: 'misskey',
 		type: 'note',
@@ -53,10 +55,10 @@ export default (params: any, me: ILocalUser) => new Promise(async (res, rej) =>
 				$in: hits
 			}
 		}, {
-			sort: {
+				sort: {
-				_id: -1
+					_id: -1
-			}
+				}
-		});
+			});
 
 		res(await Promise.all(notes.map(note => pack(note, me))));
 	});

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

@@ -1,5 +1,6 @@
 import $ from 'cafy';
 import User, { pack, ILocalUser } from '../../../../models/user';
+const escapeRegexp = require('escape-regexp');
 
 /**
  * Search a user by username
@@ -20,7 +21,7 @@ export default (params: any, me: ILocalUser) => new Promise(async (res, rej) =>
 	let users = await User
 		.find({
 			host: null,
-			usernameLower: new RegExp(query.toLowerCase())
+			usernameLower: new RegExp('^' + escapeRegexp(query.toLowerCase()))
 		}, {
 			limit: limit,
 			skip: offset
@@ -30,7 +31,31 @@ export default (params: any, me: ILocalUser) => new Promise(async (res, rej) =>
 		const remoteUsers = await User
 			.find({
 				host: { $ne: null },
-				usernameLower: new RegExp(query.toLowerCase())
+				usernameLower: new RegExp('^' + escapeRegexp(query.toLowerCase()))
+			}, {
+				limit: limit - users.length
+			});
+
+		users = users.concat(remoteUsers);
+	}
+
+	if (users.length < limit) {
+		const remoteUsers = await User
+			.find({
+				host: null,
+				usernameLower: new RegExp(escapeRegexp(query.toLowerCase()))
+			}, {
+				limit: limit - users.length
+			});
+
+		users = users.concat(remoteUsers);
+	}
+
+	if (users.length < limit) {
+		const remoteUsers = await User
+			.find({
+				host: { $ne: null },
+				usernameLower: new RegExp(escapeRegexp(query.toLowerCase()))
 			}, {
 				limit: limit - users.length
 			});

src/server/api/private/signup.ts

@@ -7,14 +7,16 @@ import generateUserToken from '../common/generate-native-user-token';
 import config from '../../../config';
 import Meta from '../../../models/meta';
 
-recaptcha.init({
+if (config.recaptcha) {
-	secret_key: config.recaptcha.secret_key
+	recaptcha.init({
-});
+		secret_key: config.recaptcha.secret_key
+	});
+}
 
 export default async (ctx: Koa.Context) => {
 	// Verify recaptcha
 	// ただしテスト時はこの機構は障害となるため無効にする
-	if (process.env.NODE_ENV !== 'test') {
+	if (process.env.NODE_ENV !== 'test' && config.recaptcha != null) {
 		const success = await recaptcha(ctx.request.body['g-recaptcha-response']);
 
 		if (!success) {

src/server/web/docs.ts

@@ -16,7 +16,7 @@ import config from '../../config';
 import I18n from '../../misc/i18n';
 import { licenseHtml } from '../../misc/license';
 const constants = require('../../const.json');
-import endpoints from '../../server/api/endpoints';
+import endpoints from '../api/endpoints';
 
 async function genVars(lang: string): Promise<{ [key: string]: any }> {
 	const vars = {} as { [key: string]: any };
@@ -113,7 +113,7 @@ const parsePropDefinition = (key: string, prop: any) => {
 	return prop;
 };
 
-const sortParams = (params: Array<{name: string}>) => {
+const sortParams = (params: Array<{ name: string }>) => {
 	return params;
 };
 
@@ -184,7 +184,7 @@ router.get('/*/api/endpoints/*', async ctx => {
 		paramDefs: ep.meta.params ? extractParamDefRef(Object.entries(ep.meta.params).map(([k, v]) => v)) : null,
 		res: ep.meta.res,
 		resProps: ep.meta.res && ep.meta.res.props ? sortParams(Object.entries(ep.meta.res.props).map(([k, v]) => parsePropDefinition(k, v))) : null,
-		resDefs: null,//extractPropDefRef(Object.entries(ep.res.props).map(([k, v]) => parsePropDefinition(k, v)))
+		resDefs: null, //extractPropDefRef(Object.entries(ep.res.props).map(([k, v]) => parsePropDefinition(k, v)))
 		src: `https://github.com/syuilo/misskey/tree/master/src/server/api/endpoints/${name}.ts`
 	};
 

src/services/drive/add-file.ts

@@ -83,7 +83,8 @@ export default async function(
 	force: boolean = false,
 	metaOnly: boolean = false,
 	url: string = null,
-	uri: string = null
+	uri: string = null,
+	sensitive = false
 ): Promise<IDriveFile> {
 	// Calc md5 hash
 	const calcHash = new Promise<string>((res, rej) => {
@@ -258,7 +259,8 @@ export default async function(
 		folderId: folder !== null ? folder._id : null,
 		comment: comment,
 		properties: properties,
-		isMetaOnly: metaOnly
+		isMetaOnly: metaOnly,
+		isSensitive: sensitive
 	} as IMetadata;
 
 	if (url !== null) {

src/services/drive/upload-from-url.ts

@@ -13,7 +13,7 @@ import * as mongodb from 'mongodb';
 
 const log = debug('misskey:drive:upload-from-url');
 
-export default async (url: string, user: IUser, folderId: mongodb.ObjectID = null, uri: string = null): Promise<IDriveFile> => {
+export default async (url: string, user: IUser, folderId: mongodb.ObjectID = null, uri: string = null, sensitive = false): Promise<IDriveFile> => {
 	log(`REQUESTED: ${url}`);
 
 	let name = URL.parse(url).pathname.split('/').pop();
@@ -48,7 +48,7 @@ export default async (url: string, user: IUser, folderId: mongodb.ObjectID = nul
 	let error;
 
 	try {
-		driveFile = await create(user, path, name, null, folderId, false, config.preventCacheRemoteFiles, url, uri);
+		driveFile = await create(user, path, name, null, folderId, false, config.preventCacheRemoteFiles, url, uri, sensitive);
 		log(`got: ${driveFile._id}`);
 	} catch (e) {
 		error = e;

src/services/note/create.ts

@@ -20,6 +20,7 @@ import UserList from '../../models/user-list';
 import resolveUser from '../../remote/resolve-user';
 import Meta from '../../models/meta';
 import config from '../../config';
+import registerHashtag from '../register-hashtag';
 
 type Type = 'reply' | 'renote' | 'quote' | 'mention';
 
@@ -64,7 +65,6 @@ export default async (user: IUser, data: {
 	geo?: any;
 	poll?: any;
 	viaMobile?: boolean;
-	tags?: string[];
 	cw?: string;
 	visibility?: string;
 	visibleUsers?: IUser[];
@@ -75,7 +75,7 @@ export default async (user: IUser, data: {
 	if (data.visibility == null) data.visibility = 'public';
 	if (data.viaMobile == null) data.viaMobile = false;
 
-	let tags = data.tags || [];
+	let tags: string[] = [];
 
 	let tokens: any[] = null;
 
@@ -149,6 +149,9 @@ export default async (user: IUser, data: {
 
 	res(note);
 
+	// ハッシュタグ登録
+	tags.map(tag => registerHashtag(user, tag));
+
 	//#region Increment notes count
 	if (isLocalUser(user)) {
 		Meta.update({}, {

src/services/register-hashtag.ts

@@ -0,0 +1,28 @@
+import { IUser } from '../models/user';
+import Hashtag from '../models/hashtag';
+
+export default async function(user: IUser, tag: string) {
+	tag = tag.toLowerCase();
+
+	const index = await Hashtag.findOne({ tag });
+
+	if (index != null) {
+		// 自分が初めてこのタグを使ったなら
+		if (!index.mentionedUserIds.some(id => id.equals(user._id))) {
+			Hashtag.update({ tag }, {
+				$push: {
+					mentionedUserIds: user._id
+				},
+				$inc: {
+					mentionedUserIdsCount: 1
+				}
+			});
+		}
+	} else {
+		Hashtag.insert({
+			tag,
+			mentionedUserIds: [user._id],
+			mentionedUserIdsCount: 1
+		});
+	}
+}

webpack.config.ts

@@ -72,7 +72,7 @@ const output = {
 
 //#region Define consts
 const consts = {
-	_RECAPTCHA_SITEKEY_: config.recaptcha.site_key,
+	_RECAPTCHA_SITEKEY_: config.recaptcha ? config.recaptcha.site_key : null,
 	_SW_PUBLICKEY_: config.sw ? config.sw.public_key : null,
 	_THEME_COLOR_: constants.themeColor,
 	_COPYRIGHT_: constants.copyright,