10.34.0

New Crowdin translations

.circleci/config.yml

@@ -0,0 +1,60 @@
+version: 2
+
+general:
+  branches:
+    ignore:
+      - l10n_develop
+
+jobs:
+  webpack-build:
+    working_directory: /misskey
+    docker:
+      - image: yukimochi/misskey-builder:latest
+    steps:
+      - checkout
+      - run:
+          name: Setup Dependencies
+          command: |
+            yarn install
+            yarn global add web-push
+      - run:
+          name: Import default.yml
+          command: |
+            echo ${IMPORT_DEFAULT_YML} | base64 -d | gzip -d > .config/default.yml
+      - run:
+          name: Build Webpack
+          command: |
+            yarn run build
+      - run:
+          name: Compress clients
+          command: |
+            find ./built/client -name "*.js" -or -name "*.js.map" -or -name "*.css" -or -name "*.svg" -or -name "*.html" -or -name "*.json" | xargs -t gzip -k -9
+            find ./built/client -name "*.js" -or -name "*.js.map" -or -name "*.css" -or -name "*.svg" -or -name "*.html" -or -name "*.json" | xargs -t brotli -q 10
+            tar cfz ~/built-${CIRCLE_SHA1}.tar.gz built
+      - run:
+          name: Send built s3
+          command: |
+            mc config host add ykmc ${s3_endpoint} ${s3_accesskey} ${s3_secretkey}
+            mc cp ~/built-${CIRCLE_SHA1}.tar.gz ${backet}/${CIRCLE_BRANCH}/
+  docker-build:
+    docker:
+      - image: docker:17-git
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run:
+          name: build docker image
+          command: |
+            docker build -t misskey:latest .
+      - run:
+          name: upload image to docker hub.
+          command: |
+            docker login --username=${DOCKER_USER} --password=${DOCKER_PASS}
+            docker push ${DOCKER_USER}/misskey:latest
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - webpack-build
+      - docker-build

.config/example.yml

@@ -164,3 +164,6 @@ drive:
 #  external: true
 #  engine: http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}
 #  timeout: 300000
+
+# Max allowed note text length in charactors
+maxNoteTextLength: 1000

.npmrc

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

.travis.yml

@@ -11,7 +11,7 @@ branches:
 language: node_js
 
 node_js:
-  - 10.1.0
+  - 11.0.0
 
 env:
   - CXX=g++-4.8 NODE_ENV=production

.travis/default.yml

@@ -13,7 +13,3 @@ redis:
   host: localhost
   port: 6379
   pass: ''
-elasticsearch:
-  host: localhost
-  port: 9200
-  pass: ''

.travis/test.yml

@@ -13,7 +13,3 @@ redis:
   host: localhost
   port: 6379
   pass: ''
-elasticsearch:
-  host: localhost
-  port: 9200
-  pass: ''

Dockerfile

@@ -1,16 +1,26 @@
-FROM alpine:edge AS base
+FROM alpine:3.8 AS base
 
 ENV NODE_ENV=production
 
-RUN apk add --no-cache nodejs nodejs-npm
-RUN apk add vips fftw --update-cache --repository https://dl-3.alpinelinux.org/alpine/edge/testing/
+RUN apk add --no-cache nodejs nodejs-npm zlib
 WORKDIR /misskey
 COPY . ./
 
 FROM base AS builder
 
-RUN apk add --no-cache	gcc g++ python autoconf automake file make nasm
-RUN apk add vips-dev fftw-dev --update-cache --repository https://dl-3.alpinelinux.org/alpine/edge/testing/
+RUN apk add --no-cache \
+    gcc \
+    g++ \
+    libc-dev \
+    python \
+    autoconf \
+    automake \
+    file \
+    make \
+    nasm \
+    pkgconfig \
+    libtool \
+    zlib-dev
 RUN npm install \
     && npm install -g node-gyp \
     && node-gyp configure \

README.md

@@ -5,7 +5,7 @@
 
 [![][travis-badge]][travis-link]
 [![][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/)
+[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
 
 **Sophisticated microblogging platform, evolving forever.**
 
@@ -71,39 +71,46 @@ Please see [Contribution guide](./CONTRIBUTING.md).
 ----------------------------------------------------------------
 <!-- PATREON_START -->
 <table><tr>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/619786/32cf01444db24e578cd1982c197f6fc6/1?token-time=2145916800&token-hash=CXe9AqlZy9AsYfiWd3OBYVOzvODoN47Litz0Tu4BFpU%3D" alt="Gargron"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12731202/0995c46cdcb54153ab5f073f5869b70a/1?token-time=2145916800&token-hash=Yd60FK_SWfQO56SeiJpy1tDHOnCV4xdEywQe8gn5_Wo%3D" alt="negao"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/13099460/43cecdbaa63a40d79bf50a96b9910b9d/1?token-time=2145916800&token-hash=d6P5MWHHsCMxUuBAEPAoVc5wLUR19mIhqAq7Ma9h9rI%3D" alt="ne_moni"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12913507/f7181eacafe8469a93033d85f5969c29/2?token-time=2145916800&token-hash=mgPdX9TqZxEg4TTPuc477dxhIgYk9246qafjWZEqZ7g%3D" alt="Melilot"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12999811/5f349fafcce44dd1824a8b1ebbec4564/2?token-time=2145916800&token-hash=rwZ8qvbm_kpA4ib3kc07tVKupXeySpY5ATQFGxfL9v0%3D" alt="Xeltica"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/3384329/8b713330cb27404ea6e9fac50ff96efe/1?token-time=2145916800&token-hash=0eu4-m1gTWA9PhptVZt6rdKcusqcD7RB87rJT23VVFI%3D" alt="べすれい"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12021162/963128bb8d14476dbd8407943db8f31a/1?token-time=2145916800&token-hash=GgJ_NmUB6_nnRNLVGUWjV-WX91On7BOu59LKncYV9fE%3D" alt="gutfuckllc"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/11357794/923ce94cd8c44ba788ee931907881839/1?token-time=2145916800&token-hash=I8lJVM8LeW6TSo5W6uIIRZ42cw83zp1wK_FsbzY0mcQ%3D" alt="mydarkstar"></td>
 <td><img src="https://c8.patreon.com/2/100/12718187" alt="Peter G."></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/13039004/509d0c412eb14ae08d6a812a3054f7d6/1?token-time=2145916800&token-hash=zwSu01tOtn5xTUucDZHuPsCxF2HBEMVs9ROJKTlEV_o%3D" alt="nemu"></td>
 </tr><tr>
-<td><a href="https://www.patreon.com/mastodon">Gargron</a></td>
 <td><a href="https://www.patreon.com/negao">negao</a></td>
-<td><a href="https://www.patreon.com/user?u=13099460">ne_moni</a></td>
 <td><a href="https://www.patreon.com/user?u=12913507">Melilot</a></td>
-<td><a href="https://www.patreon.com/AxellaMC">Xeltica</a></td>
 <td><a href="https://www.patreon.com/user?u=3384329">べすれい</a></td>
 <td><a href="https://www.patreon.com/gutfuckllc">gutfuckllc</a></td>
+<td><a href="https://www.patreon.com/mydarkstar">mydarkstar</a></td>
 <td><a href="https://www.patreon.com/user?u=12718187">Peter G.</a></td>
-<td><a href="https://www.patreon.com/user?u=13039004">nemu</a></td>
 </tr></table>
 <table><tr>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/13039004/509d0c412eb14ae08d6a812a3054f7d6/1?token-time=2145916800&token-hash=zwSu01tOtn5xTUucDZHuPsCxF2HBEMVs9ROJKTlEV_o%3D" alt="nemu"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/2?token-time=2145916800&token-hash=zElv7ZcPL3viGsXbNG_KWiKrbV0vvw1gk0panx8DJoo%3D" alt="Naoki Kosaka"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/8241184/39e18850e87a449e9c9a71acb3310ebd/2?token-time=2145916800&token-hash=iUXOQzRyJDv3PJxwS7Mjwg1459dzh2trOq6NFtXu_OM%3D" alt="Acid Chicken"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/13034746/c711c7f58e204ecfbc2fd646bc8a4eee/1?token-time=2145916800&token-hash=UERBN4OyP7Nh5XwwdDg0N0IE5cD6_qUQMO81Z5Wizso%3D" alt="Hiratake"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/10789744/97175095d8f04c0f86225ff47cb98d40/1?token-time=2145916800&token-hash=P4BIzCX2I1CkEP66ottfhsC8Wr6BUSamjA-vq3pLqFI%3D" alt="Naoki Hirayama"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/4503830/ccf2cc867ea64de0b524bb2e24b9a1cb/1?token-time=2145916800&token-hash=S1zP0QyLU52Dqq6dtc9qNYyWfW86XrYHiR4NMbeOrnA%3D" alt="dansup"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/619786/32cf01444db24e578cd1982c197f6fc6/1?token-time=2145916800&token-hash=tB1e_r8RlZ5sFL0KV_e8dugapxatNBRK1Z3h67TO1g8%3D" alt="Gargron"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/5731881/4b6038e6cda34c04b83a5fcce3806a93/1?token-time=2145916800&token-hash=VZUtwrjQa8Jml4twCjHYQQZ64wHEY4oIlGl7Kc-VYUQ%3D" alt="Nokotaro Takeda"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1?token-time=2145916800&token-hash=tMosUojzUYJCH_3t--tvYA-SMCyrS__hzSndyaRSnbo%3D" alt="Takashi Shibuya"></td>
 </tr><tr>
+<td><a href="https://www.patreon.com/user?u=13039004">nemu</a></td>
 <td><a href="https://www.patreon.com/user?u=5881381">Naoki Kosaka</a></td>
+<td><a href="https://www.patreon.com/acid_chicken">Acid Chicken</a></td>
 <td><a href="https://www.patreon.com/hiratake">Hiratake</a></td>
+<td><a href="https://www.patreon.com/spinlock">Naoki Hirayama</a></td>
 <td><a href="https://www.patreon.com/dansup">dansup</a></td>
+<td><a href="https://www.patreon.com/mastodon">Gargron</a></td>
+<td><a href="https://www.patreon.com/takenoko">Nokotaro Takeda</a></td>
 <td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
 </tr></table>
+<table><tr>
+</tr><tr>
+</tr></table>
 
-**Last updated:** Tue, 02 Oct 2018 09:25:07 UTC
+**Last updated:** Sat, 27 Oct 2018 04:36:06 UTC
 <!-- PATREON_END -->
 
 :four_leaf_clover: Copyright

cli/del-usr.js

@@ -1,13 +0,0 @@
-const deleteUser = require('../built/models/user').deleteUser;
-
-const args = process.argv.slice(2);
-
-const userId = args[0];
-
-console.log(`deleting ${userId}...`);
-
-deleteUser(userId).then(() => {
-	console.log('done');
-}, e => {
-	console.error(e);
-});

cli/mark-verified.js

@@ -1,23 +0,0 @@
-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/recount-stats.js

@@ -1,42 +0,0 @@
-const { default: Note } = require('../built/models/note');
-const { default: Meta } = require('../built/models/meta');
-const { default: User } = require('../built/models/user');
-
-async function main() {
-	const meta = await Meta.findOne({});
-
-	const notesCount = await Note.count();
-
-	const usersCount = await User.count();
-
-	const originalNotesCount = await Note.count({
-		'_user.host': null
-	});
-
-	const originalUsersCount = await User.count({
-		host: null
-	});
-
-	const stats = {
-		notesCount,
-		usersCount,
-		originalNotesCount,
-		originalUsersCount
-	};
-
-	if (meta) {
-		await Meta.update({}, {
-			$set: {
-				stats
-			}
-		});
-	} else {
-		await Meta.insert({
-			stats
-		});
-	}
-}
-
-main().then(() => {
-	console.log('done');
-}).catch(console.error);

docker-compose.yml

@@ -6,7 +6,7 @@ services:
     restart: always
     links:
       - mongo
-      - redis
+#      - redis
 #      - es
     ports:
       - "127.0.0.1:3000:3000"
@@ -14,18 +14,18 @@ services:
       - internal_network
       - external_network
 
-  redis:
-    restart: always
-    image: redis:4.0-alpine
-    networks:
-      - internal_network
+#  redis:
+#    restart: always
+#    image: redis:4.0-alpine
+#    networks:
+#      - internal_network
 ### Uncomment to enable Redis persistance
-#    volumes:
-#      - ./redis:/data
+##    volumes:
+##      - ./redis:/data
 
   mongo:
     restart: always
-    image: mongo:4.1-bionic
+    image: mongo:4.1
     networks:
       - internal_network
     environment:

docs/docker.en.md

@@ -7,23 +7,29 @@ This guide describes how to install and setup Misskey with Docker.
 
 ----------------------------------------------------------------
 
-*1.* Make configuration files
+*1.* Download Misskey
+----------------------------------------------------------------
+1. `git clone -b master git://github.com/syuilo/misskey.git` Clone Misskey repository's master branch.
+2. `cd misskey` Move to misskey directory.
+3. `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) tag.
+
+*2.* Make configuration files
 ----------------------------------------------------------------
 1. `cp .config/example.yml .config/default.yml` Copy the `.config/example.yml` and rename it to `default.yml`.
 2. `cp .config/mongo_initdb_example.js .config/mongo_initdb.js` Copy the `.config/mongo_initdb_example.js` and rename it to `mongo_initdb.js`.
 2. Edit `default.yml` and `mongo_initdb.js`.
 
-*2.* Configure Docker
+*3.* Configure Docker
 ----------------------------------------------------------------
 Edit `docker-compose.yml`.
 
-*3.* Build Misskey
+*4.* Build Misskey
 ----------------------------------------------------------------
 Build misskey with the following:
 
 `docker-compose build`
 
-*4.* That is it.
+*5.* That is it.
 ----------------------------------------------------------------
 Well done! Now, you have an environment that run to Misskey.
 

docs/docker.ja.md

@@ -7,23 +7,29 @@ Dockerを使ったMisskey構築方法
 
 ----------------------------------------------------------------
 
-*1.* 設定ファイルを作成する
+*1.* Misskeyのダウンロード
+----------------------------------------------------------------
+1. `git clone -b master git://github.com/syuilo/misskey.git` masterブランチからMisskeyレポジトリをクローン
+2. `cd misskey` misskeyディレクトリに移動
+3. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` [最新のリリース](https://github.com/syuilo/misskey/releases/latest)を確認
+
+*2.* 設定ファイルを作成する
 ----------------------------------------------------------------
 1. `cp .config/example.yml .config/default.yml` `.config/example.yml`をコピーし名前を`default.yml`にする
 2. `cp .config/mongo_initdb_example.js .config/mongo_initdb.js` `.config/mongo_initdb_example.js`をコピーし名前を`mongo_initdb.js`にする
 3. `default.yml`と`mongo_initdb.js`を編集する
 
-*2.* Dockerの設定
+*3.* Dockerの設定
 ----------------------------------------------------------------
 `docker-compose.yml`を編集してください。
 
-*3.* Misskeyのビルド
+*4.* Misskeyのビルド
 ----------------------------------------------------------------
 次のコマンドでMisskeyをビルドしてください:
 
 `docker-compose build`
 
-*4.* 以上です！
+*5.* 以上です！
 ----------------------------------------------------------------
 お疲れ様でした。これでMisskeyを動かす準備は整いました。
 
@@ -45,4 +51,4 @@ Dockerを使ったMisskey構築方法
 
 ----------------------------------------------------------------
 
-なにかお困りのことがありましたらお気軽にご連絡ください。
+なにかお困りのことがありましたらお気軽にご連絡ください。

locales/ca-ES.yml

@@ -62,6 +62,7 @@ common:
     years_ago: "{}年前"
   month-and-day: "{month}月 {day}日"
   trash: "ゴミ箱"
+  drive: "ドライブ"
   weekday-short:
     sunday: "日"
     monday: "月"
@@ -541,11 +542,14 @@ desktop/views/components/charts.vue:
   title: "チャート"
   per-day: "1日ごと"
   per-hour: "1時間ごと"
+  federation: "フェデレーション"
   notes: "投稿"
   users: "ユーザー"
   drive: "ドライブ"
   network: "ネットワーク"
   charts:
+    federation-instances: "インスタンスの増減"
+    federation-instances-total: "インスタンスの積算"
     notes: "投稿の増減 (統合)"
     local-notes: "投稿の増減 (ローカル)"
     remote-notes: "投稿の増減 (リモート)"
@@ -575,7 +579,6 @@ desktop/views/components/crop-window.vue:
   ok: "決定"
 desktop/views/components/drive-window.vue:
   used: "使用中"
-  drive: "ドライブ"
 desktop/views/components/drive.file.vue:
   avatar: "アイコン"
   banner: "バナー"
@@ -605,8 +608,6 @@ desktop/views/components/drive.folder.vue:
     rename: "名前を変更"
     rename-folder: "フォルダ名の変更"
     input-new-folder-name: "新しいフォルダ名を入力してください"
-desktop/views/components/drive.nav-folder.vue:
-  drive: "ドライブ"
 desktop/views/components/drive.vue:
   search: "検索"
   load-more: "もっと読み込む"
@@ -741,7 +742,6 @@ desktop/views/components/settings.vue:
   notification: "通知"
   apps: "アプリ"
   mute: "ミュート"
-  drive: "ドライブ"
   security: "セキュリティ"
   signin: "サインイン履歴"
   password: "パスワード"
@@ -847,18 +847,26 @@ desktop/views/components/settings.2fa.vue:
   success: "設定が完了しました！"
   failed: "設定に失敗しました。トークンに誤りがないかご確認ください。"
   info: "次回サインインからは、同様にパスワードに加えてデバイスに表示されているトークンを入力します。"
-desktop/views/components/settings.api.vue:
+common/views/components/api-settings.vue:
   intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
   caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
   regeneration-of-token: "万が一このトークンが漏れたりその可能性がある場合はトークンを再生成できます。"
   regenerate-token: "トークンを再生成"
   token: "Token:"
   enter-password: "パスワードを入力してください"
+  console:
+    title: 'APIコンソール'
+    endpoint: 'エンドポイント'
+    parameter: 'パラメータ'
+    send: '送信'
+    sending: '応答待ち'
+    response: '結果'
 desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
-desktop/views/components/settings.drive.vue:
-  max: "中"
+common/views/components/drive-settings.vue:
+  max: "容量"
   in-use: "使用中"
+  stats: "統計"
 desktop/views/components/settings.mute.vue:
   no-users: "ミュートしているユーザーはいません"
 desktop/views/components/settings.password.vue:
@@ -892,7 +900,6 @@ desktop/views/components/ui.header.vue:
   adjective: "さん"
 desktop/views/components/ui.header.account.vue:
   profile: "プロフィール"
-  drive: "ドライブ"
   favorites: "お気に入り"
   lists: "リスト"
   follow-requests: "フォロー申請"
@@ -936,7 +943,6 @@ desktop/views/components/window.vue:
   close: "閉じる"
 desktop/views/pages/admin/admin.vue:
   dashboard: "ダッシュボード"
-  drive: "ドライブ"
   users: "ユーザー"
   update: "更新"
   announcements: "お知らせ"
@@ -976,6 +982,12 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-view: "メディアビュー"
   edit: "オプション"
 desktop/views/pages/deck/deck.user-column.vue:
+  posts: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+  images: "画像"
+  activity: "アクティビティ"
+  timeline: "タイムライン"
   pinned-notes: "ピン留めされた投稿"
   push-to-a-list: "リストに追加"
 desktop/views/pages/stats/stats.vue:
@@ -1043,6 +1055,9 @@ desktop/views/pages/user/user.profile.vue:
   mute: "ミュートする"
   muted: "ミュートしています"
   unmute: "ミュート解除"
+  block: "ブロックする"
+  unblock: "ブロック解除"
+  block-confirm: "このユーザーをブロックしますか？"
   push-to-a-list: "リストに追加"
   list-pushed: "{user}を{list}に追加しました。"
 desktop/views/pages/user/user.header.vue:
@@ -1083,7 +1098,6 @@ desktop/views/widgets/users.vue:
   refresh: "他を見る"
   no-one: "いません！"
 mobile/views/components/drive.vue:
-  drive: "ドライブ"
   used: "使用中"
   folder-count: "フォルダ"
   count-separator: "、"
@@ -1187,7 +1201,6 @@ mobile/views/components/ui.nav.vue:
   messaging: "メッセージ"
   follow-requests: "フォロー申請"
   search: "検索"
-  drive: "ドライブ"
   favorites: "お気に入り"
   user-lists: "リスト"
   widgets: "ウィジェット"
@@ -1210,7 +1223,6 @@ mobile/views/pages/user-lists.vue:
   title: "リスト"
   enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
-  drive: "ドライブ"
   more: "もっと見る"
 mobile/views/pages/signup.vue:
   lets-start: "📦 始めましょう"
@@ -1320,6 +1332,10 @@ mobile/views/pages/user.vue:
   timeline: "タイムライン"
   media: "メディア"
   is-suspended: "このユーザーは凍結されています。"
+  mute: "ミュート"
+  unmute: "ミュート解除"
+  block: "ブロック"
+  unblock: "ブロック解除"
 mobile/views/pages/user/home.vue:
   recent-notes: "最近の投稿"
   images: "画像"

locales/de-DE.yml

@@ -62,6 +62,7 @@ common:
     years_ago: "vor {} Jahr{0:en}"
   month-and-day: "{day}/{month}"
   trash: "Papierkorb"
+  drive: "ドライブ"
   weekday-short:
     sunday: "So"
     monday: "Mo"
@@ -541,11 +542,14 @@ desktop/views/components/charts.vue:
   title: "チャート"
   per-day: "1日ごと"
   per-hour: "1時間ごと"
+  federation: "フェデレーション"
   notes: "投稿"
   users: "ユーザー"
   drive: "ドライブ"
   network: "Netzwerk"
   charts:
+    federation-instances: "インスタンスの増減"
+    federation-instances-total: "インスタンスの積算"
     notes: "投稿の増減 (統合)"
     local-notes: "投稿の増減 (ローカル)"
     remote-notes: "投稿の増減 (リモート)"
@@ -575,7 +579,6 @@ desktop/views/components/crop-window.vue:
   ok: "OK"
 desktop/views/components/drive-window.vue:
   used: "benutzt"
-  drive: "Speicher"
 desktop/views/components/drive.file.vue:
   avatar: "Avatar"
   banner: "Banner"
@@ -605,8 +608,6 @@ desktop/views/components/drive.folder.vue:
     rename: "Umbenennen"
     rename-folder: "Ordner umbenennen"
     input-new-folder-name: "Namen für neuen Ordner eingeben"
-desktop/views/components/drive.nav-folder.vue:
-  drive: "Laufwerk"
 desktop/views/components/drive.vue:
   search: "Suchen"
   load-more: "Mehr laden"
@@ -741,7 +742,6 @@ desktop/views/components/settings.vue:
   notification: "Mitteilungen"
   apps: "In App öffnen"
   mute: "Stummschalten"
-  drive: "Dateien vom Drive anfügen"
   security: "Sicherheit"
   signin: "サインイン履歴"
   password: "Passwort"
@@ -847,18 +847,26 @@ desktop/views/components/settings.2fa.vue:
   success: "設定が完了しました！"
   failed: "設定に失敗しました。トークンに誤りがないかご確認ください。"
   info: "次回サインインからは、同様にパスワードに加えてデバイスに表示されているトークンを入力します。"
-desktop/views/components/settings.api.vue:
+common/views/components/api-settings.vue:
   intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
   caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
   regeneration-of-token: "万が一このトークンが漏れたりその可能性がある場合はトークンを再生成できます。"
   regenerate-token: "トークンを再生成"
   token: "Token:"
-  enter-password: "Bitte Passwort eingeben"
+  enter-password: "パスワードを入力してください"
+  console:
+    title: 'APIコンソール'
+    endpoint: 'エンドポイント'
+    parameter: 'パラメータ'
+    send: '送信'
+    sending: '応答待ち'
+    response: '結果'
 desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
-desktop/views/components/settings.drive.vue:
-  max: "中"
+common/views/components/drive-settings.vue:
+  max: "容量"
   in-use: "使用中"
+  stats: "統計"
 desktop/views/components/settings.mute.vue:
   no-users: "ミュートしているユーザーはいません"
 desktop/views/components/settings.password.vue:
@@ -892,7 +900,6 @@ desktop/views/components/ui.header.vue:
   adjective: "さん"
 desktop/views/components/ui.header.account.vue:
   profile: "Dein Profil"
-  drive: "Speicher"
   favorites: "Favoriten"
   lists: "Listen"
   follow-requests: "フォロー申請"
@@ -936,7 +943,6 @@ desktop/views/components/window.vue:
   close: "閉じる"
 desktop/views/pages/admin/admin.vue:
   dashboard: "ダッシュボード"
-  drive: "ドライブ"
   users: "ユーザー"
   update: "更新"
   announcements: "お知らせ"
@@ -976,6 +982,12 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-view: "メディアビュー"
   edit: "オプション"
 desktop/views/pages/deck/deck.user-column.vue:
+  posts: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+  images: "画像"
+  activity: "アクティビティ"
+  timeline: "タイムライン"
   pinned-notes: "ピン留めされた投稿"
   push-to-a-list: "リストに追加"
 desktop/views/pages/stats/stats.vue:
@@ -1043,6 +1055,9 @@ desktop/views/pages/user/user.profile.vue:
   mute: "ミュートする"
   muted: "ミュートしています"
   unmute: "ミュート解除"
+  block: "ブロックする"
+  unblock: "ブロック解除"
+  block-confirm: "このユーザーをブロックしますか？"
   push-to-a-list: "リストに追加"
   list-pushed: "{user}を{list}に追加しました。"
 desktop/views/pages/user/user.header.vue:
@@ -1083,7 +1098,6 @@ desktop/views/widgets/users.vue:
   refresh: "他を見る"
   no-one: "いません！"
 mobile/views/components/drive.vue:
-  drive: "ドライブ"
   used: "使用中"
   folder-count: "フォルダ"
   count-separator: "、"
@@ -1187,7 +1201,6 @@ mobile/views/components/ui.nav.vue:
   messaging: "メッセージ"
   follow-requests: "フォロー申請"
   search: "検索"
-  drive: "ドライブ"
   favorites: "お気に入り"
   user-lists: "リスト"
   widgets: "ウィジェット"
@@ -1210,7 +1223,6 @@ mobile/views/pages/user-lists.vue:
   title: "リスト"
   enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
-  drive: "ドライブ"
   more: "Mehr laden"
 mobile/views/pages/signup.vue:
   lets-start: "📦 始めましょう"
@@ -1320,6 +1332,10 @@ mobile/views/pages/user.vue:
   timeline: "タイムライン"
   media: "メディア"
   is-suspended: "このユーザーは凍結されています。"
+  mute: "ミュート"
+  unmute: "ミュート解除"
+  block: "ブロック"
+  unblock: "ブロック解除"
 mobile/views/pages/user/home.vue:
   recent-notes: "最近の投稿"
   images: "画像"

locales/en-US.yml

@@ -62,6 +62,7 @@ common:
     years_ago: "{}year(s) ago"
   month-and-day: "{month}/{day}"
   trash: "Trash"
+  drive: "Drive"
   weekday-short:
     sunday: "S"
     monday: "M"
@@ -541,11 +542,14 @@ desktop/views/components/charts.vue:
   title: "Charts"
   per-day: "per Day"
   per-hour: "per Hour"
+  federation: "Federation"
   notes: "Posts"
   users: "Users"
   drive: "Drive"
   network: "Network"
   charts:
+    federation-instances: "The number of instances: increase/decrease"
+    federation-instances-total: "Total number of instances"
     notes: "The number of posts: increase/decrease (Combined)"
     local-notes: "The number of posts: increase/decrease (Local)"
     remote-notes: "The number of posts: increase/decrease (Remote)"
@@ -575,7 +579,6 @@ desktop/views/components/crop-window.vue:
   ok: "OK"
 desktop/views/components/drive-window.vue:
   used: "used"
-  drive: "Media storage"
 desktop/views/components/drive.file.vue:
   avatar: "Avatar"
   banner: "Banner"
@@ -605,8 +608,6 @@ desktop/views/components/drive.folder.vue:
     rename: "Rename"
     rename-folder: "Rename folder"
     input-new-folder-name: "Enter new name"
-desktop/views/components/drive.nav-folder.vue:
-  drive: "Media storage"
 desktop/views/components/drive.vue:
   search: "Search"
   load-more: "Load more"
@@ -741,7 +742,6 @@ desktop/views/components/settings.vue:
   notification: "Notification"
   apps: "Apps"
   mute: "Mute"
-  drive: "Drive"
   security: "Security"
   signin: "Sign in history"
   password: "Password"
@@ -847,18 +847,26 @@ desktop/views/components/settings.2fa.vue:
   success: "Settings saved!"
   failed: "Failed to setup. Please ensure that the token is correct."
   info: "From the next time you sign in to Misskey, the token displayed on your device will be necessary too, as well as the password."
-desktop/views/components/settings.api.vue:
+common/views/components/api-settings.vue:
   intro: "To access the API, set this token as the key 'i' of request parameters."
   caution: "Do not enter this token to any apps nor tell this token to others otherwise your account may get compromised."
   regeneration-of-token: "If your token gets leaked, you can regenerate it."
   regenerate-token: "Regenerate the token"
   token: "Token:"
-  enter-password: "Please enter the password"
+  enter-password: "Enter the password"
+  console:
+    title: 'API console'
+    endpoint: 'Endpoint'
+    parameter: 'Parameters'
+    send: 'Send'
+    sending: 'Sending'
+    response: 'Result'
 desktop/views/components/settings.apps.vue:
   no-apps: "No linked applications"
-desktop/views/components/settings.drive.vue:
+common/views/components/drive-settings.vue:
   max: "Max"
   in-use: "In use"
+  stats: "Statistics"
 desktop/views/components/settings.mute.vue:
   no-users: "No muted users"
 desktop/views/components/settings.password.vue:
@@ -892,7 +900,6 @@ desktop/views/components/ui.header.vue:
   adjective: "-san"
 desktop/views/components/ui.header.account.vue:
   profile: "Your profile"
-  drive: "Media storage"
   favorites: "Favorites"
   lists: "Lists"
   follow-requests: "Follow requests"
@@ -936,11 +943,10 @@ desktop/views/components/window.vue:
   close: "Close"
 desktop/views/pages/admin/admin.vue:
   dashboard: "Dashboard"
-  drive: "Drive"
   users: "Users"
   update: "Updates"
-  announcements: "お知らせ"
-  hashtags: "ハッシュタグ"
+  announcements: "Announcements"
+  hashtags: "Hashtags"
 desktop/views/pages/admin/admin.dashboard.vue:
   dashboard: "Dashboard"
   all-users: "All Users"
@@ -968,7 +974,7 @@ desktop/views/pages/admin/admin.unverify-user.vue:
   unverify: "Unverify account"
   unverified: "The account is now being unverified"
 desktop/views/pages/admin/admin.announcements.vue:
-  announcements: "お知らせ"
+  announcements: "Announcements"
 desktop/views/pages/admin/admin.hashtags.vue:
   hided-tags: "Hidden Tags"
 desktop/views/pages/deck/deck.tl-column.vue:
@@ -976,6 +982,12 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-view: "Media view"
   edit: "Options"
 desktop/views/pages/deck/deck.user-column.vue:
+  posts: "Posts"
+  following: "Following"
+  followers: "Followers"
+  images: "Images"
+  activity: "Activity"
+  timeline: "Timeline"
   pinned-notes: "Pinned posts"
   push-to-a-list: "Add to list"
 desktop/views/pages/stats/stats.vue:
@@ -1043,6 +1055,9 @@ desktop/views/pages/user/user.profile.vue:
   mute: "Mute"
   muted: "Muting"
   unmute: "Unmute"
+  block: "Block"
+  unblock: "Unblock"
+  block-confirm: "Are you sure block this user?"
   push-to-a-list: "Add to list"
   list-pushed: "Successfully added {user} to {list}."
 desktop/views/pages/user/user.header.vue:
@@ -1083,7 +1098,6 @@ desktop/views/widgets/users.vue:
   refresh: "refresh"
   no-one: "Anyone!"
 mobile/views/components/drive.vue:
-  drive: "Media storage"
   used: "used"
   folder-count: "Folder(s)"
   count-separator: ", "
@@ -1187,7 +1201,6 @@ mobile/views/components/ui.nav.vue:
   messaging: "Messages"
   follow-requests: "Follow requests"
   search: "Search"
-  drive: "Drive"
   favorites: "Favorites"
   user-lists: "Lists"
   widgets: "Widgets"
@@ -1210,7 +1223,6 @@ mobile/views/pages/user-lists.vue:
   title: "Lists"
   enter-list-name: "Enter a name of the list to make"
 mobile/views/pages/drive.vue:
-  drive: "Drive"
   more: "Load more"
 mobile/views/pages/signup.vue:
   lets-start: "Your account is now ready! 📦"
@@ -1320,6 +1332,10 @@ mobile/views/pages/user.vue:
   timeline: "Timeline"
   media: "Media"
   is-suspended: "This account has been suspended."
+  mute: "Mute"
+  unmute: "Unmute"
+  block: "Block"
+  unblock: "Unblock"
 mobile/views/pages/user/home.vue:
   recent-notes: "Recent notes"
   images: "Images"

locales/es-ES.yml

@@ -62,6 +62,7 @@ common:
     years_ago: "Hace {} año(s)"
   month-and-day: "{day} de {month}"
   trash: "Papelera"
+  drive: "ドライブ"
   weekday-short:
     sunday: "domingo"
     monday: "lunes"
@@ -541,11 +542,14 @@ desktop/views/components/charts.vue:
   title: "Gráficos"
   per-day: "por día"
   per-hour: "por hora"
+  federation: "フェデレーション"
   notes: "Publicaciones"
   users: "Usuarios"
   drive: "Unidad"
   network: "ネットワーク"
   charts:
+    federation-instances: "インスタンスの増減"
+    federation-instances-total: "インスタンスの積算"
     notes: "Número de publicaciones: aumentar/disminuir (Combinado)"
     local-notes: "Número de publicaciones: aumentar/disminuir (Local)"
     remote-notes: "Número de publicaciones: aumentar/disminuir (Remoto)"
@@ -575,7 +579,6 @@ desktop/views/components/crop-window.vue:
   ok: "OK"
 desktop/views/components/drive-window.vue:
   used: "usado"
-  drive: "Disco"
 desktop/views/components/drive.file.vue:
   avatar: "Avatar"
   banner: "Banner"
@@ -605,8 +608,6 @@ desktop/views/components/drive.folder.vue:
     rename: "Renombrar"
     rename-folder: "Renombrar carpeta"
     input-new-folder-name: "Escribe el nombre nuevo"
-desktop/views/components/drive.nav-folder.vue:
-  drive: "Disco"
 desktop/views/components/drive.vue:
   search: "Buscar"
   load-more: "Cargar más"
@@ -741,7 +742,6 @@ desktop/views/components/settings.vue:
   notification: "Notificación"
   apps: "Aplicaciones"
   mute: "Silenciar"
-  drive: "Disco"
   security: "Seguridad"
   signin: "Historial de inicios de sesión"
   password: "Contraseña"
@@ -847,18 +847,26 @@ desktop/views/components/settings.2fa.vue:
   success: "¡Configuraciones guardadas!"
   failed: "Error al configurar. Por favor asegúrate de que el token es correcto."
   info: "Desde ahora, ingresa el token que se muestra en tu dispositivo adicionalmente a tu contraseña cuando inicies sesión en Misskey"
-desktop/views/components/settings.api.vue:
-  intro: "Para acceder al API, configura este token como la letra \"i\" de los parámetros requeridos."
-  caution: "Por favor no muestres este token a otros (no lo ingreses en otro lugar que no sea aquí). De otra forma, tu cuenta puede llegar a ser comprometida."
-  regeneration-of-token: "En el caso no deseado de que este token lo tenga otra persona, puedes regenerarlo."
-  regenerate-token: "Regenerar el token"
+common/views/components/api-settings.vue:
+  intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
+  caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
+  regeneration-of-token: "万が一このトークンが漏れたりその可能性がある場合はトークンを再生成できます。"
+  regenerate-token: "トークンを再生成"
   token: "Token:"
-  enter-password: "Por favor ingresa tu contraseña"
+  enter-password: "パスワードを入力してください"
+  console:
+    title: 'APIコンソール'
+    endpoint: 'エンドポイント'
+    parameter: 'パラメータ'
+    send: '送信'
+    sending: '応答待ち'
+    response: '結果'
 desktop/views/components/settings.apps.vue:
   no-apps: "No hay aplicaciones asociadas"
-desktop/views/components/settings.drive.vue:
-  max: "Max"
-  in-use: "en uso."
+common/views/components/drive-settings.vue:
+  max: "容量"
+  in-use: "使用中"
+  stats: "統計"
 desktop/views/components/settings.mute.vue:
   no-users: "No hay usuarios silenciados"
 desktop/views/components/settings.password.vue:
@@ -892,7 +900,6 @@ desktop/views/components/ui.header.vue:
   adjective: "-san"
 desktop/views/components/ui.header.account.vue:
   profile: "Tu perfil"
-  drive: "Unidad"
   favorites: "Favoritos"
   lists: "Listas"
   follow-requests: "Solicitudes de seguimiento"
@@ -936,7 +943,6 @@ desktop/views/components/window.vue:
   close: "閉じる"
 desktop/views/pages/admin/admin.vue:
   dashboard: "ダッシュボード"
-  drive: "ドライブ"
   users: "ユーザー"
   update: "更新"
   announcements: "お知らせ"
@@ -976,6 +982,12 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-view: "メディアビュー"
   edit: "オプション"
 desktop/views/pages/deck/deck.user-column.vue:
+  posts: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+  images: "画像"
+  activity: "アクティビティ"
+  timeline: "タイムライン"
   pinned-notes: "ピン留めされた投稿"
   push-to-a-list: "リストに追加"
 desktop/views/pages/stats/stats.vue:
@@ -1043,6 +1055,9 @@ desktop/views/pages/user/user.profile.vue:
   mute: "ミュートする"
   muted: "ミュートしています"
   unmute: "ミュート解除"
+  block: "ブロックする"
+  unblock: "ブロック解除"
+  block-confirm: "このユーザーをブロックしますか？"
   push-to-a-list: "リストに追加"
   list-pushed: "{user}を{list}に追加しました。"
 desktop/views/pages/user/user.header.vue:
@@ -1083,7 +1098,6 @@ desktop/views/widgets/users.vue:
   refresh: "他を見る"
   no-one: "いません！"
 mobile/views/components/drive.vue:
-  drive: "ドライブ"
   used: "使用中"
   folder-count: "フォルダ"
   count-separator: "、"
@@ -1187,7 +1201,6 @@ mobile/views/components/ui.nav.vue:
   messaging: "メッセージ"
   follow-requests: "フォロー申請"
   search: "検索"
-  drive: "ドライブ"
   favorites: "お気に入り"
   user-lists: "リスト"
   widgets: "ウィジェット"
@@ -1210,7 +1223,6 @@ mobile/views/pages/user-lists.vue:
   title: "リスト"
   enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
-  drive: "ドライブ"
   more: "もっと見る"
 mobile/views/pages/signup.vue:
   lets-start: "📦 始めましょう"
@@ -1320,6 +1332,10 @@ mobile/views/pages/user.vue:
   timeline: "タイムライン"
   media: "メディア"
   is-suspended: "このユーザーは凍結されています。"
+  mute: "ミュート"
+  unmute: "ミュート解除"
+  block: "ブロック"
+  unblock: "ブロック解除"
 mobile/views/pages/user/home.vue:
   recent-notes: "最近の投稿"
   images: "画像"

locales/fr-FR.yml

@@ -62,6 +62,7 @@ common:
     years_ago: "Il y a {} an·s"
   month-and-day: "{month} mois/{day} jour"
   trash: "Corbeille"
+  drive: "ドライブ"
   weekday-short:
     sunday: "D"
     monday: "L"
@@ -541,11 +542,14 @@ desktop/views/components/charts.vue:
   title: "Graphiques"
   per-day: "par jour"
   per-hour: "par heure"
+  federation: "フェデレーション"
   notes: "Publications"
   users: "Utilisateurs"
   drive: "Drive"
   network: "Réseau"
   charts:
+    federation-instances: "インスタンスの増減"
+    federation-instances-total: "インスタンスの積算"
     notes: "投稿の増減 (統合)"
     local-notes: "投稿の増減 (ローカル)"
     remote-notes: "投稿の増減 (リモート)"
@@ -575,7 +579,6 @@ desktop/views/components/crop-window.vue:
   ok: "OK"
 desktop/views/components/drive-window.vue:
   used: "utilisé"
-  drive: "Drive"
 desktop/views/components/drive.file.vue:
   avatar: "Avatar"
   banner: "Bannière"
@@ -605,8 +608,6 @@ desktop/views/components/drive.folder.vue:
     rename: "Renommer"
     rename-folder: "Renommer le dossier"
     input-new-folder-name: "Entrer un nouveau nom"
-desktop/views/components/drive.nav-folder.vue:
-  drive: "Drive"
 desktop/views/components/drive.vue:
   search: "Rechercher"
   load-more: "Afficher plus"
@@ -741,7 +742,6 @@ desktop/views/components/settings.vue:
   notification: "Notification"
   apps: "Applications"
   mute: "Mettre en sourdine"
-  drive: "Drive"
   security: "Sécurité"
   signin: "Historique de connexion"
   password: "Mot de Passe"
@@ -847,18 +847,26 @@ desktop/views/components/settings.2fa.vue:
   success: "L'operation a été complétée avec succès!"
   failed: "L'operation a échoué. Veuillez vous assurer que le token a été entrer correctement."
   info: "À partir de maintenant, à chaque fois que vous vous connecter entrez votre mot de passe ainsi que le token généré sur votre appareil."
-desktop/views/components/settings.api.vue:
+common/views/components/api-settings.vue:
   intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
   caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
-  regeneration-of-token: "Si votre jeton est compromis, vous pouvez le régénérer."
-  regenerate-token: "Regenerer le token"
-  token: "Jeton :"
-  enter-password: "Veuillez entrer le mot de passe"
+  regeneration-of-token: "万が一このトークンが漏れたりその可能性がある場合はトークンを再生成できます。"
+  regenerate-token: "トークンを再生成"
+  token: "Token:"
+  enter-password: "パスワードを入力してください"
+  console:
+    title: 'APIコンソール'
+    endpoint: 'エンドポイント'
+    parameter: 'パラメータ'
+    send: '送信'
+    sending: '応答待ち'
+    response: '結果'
 desktop/views/components/settings.apps.vue:
   no-apps: "Aucune application autorisée"
-desktop/views/components/settings.drive.vue:
-  max: "Maximum"
-  in-use: "en cours d’utilisation"
+common/views/components/drive-settings.vue:
+  max: "容量"
+  in-use: "使用中"
+  stats: "統計"
 desktop/views/components/settings.mute.vue:
   no-users: "Aucun utilisateurs mis en sourdine"
 desktop/views/components/settings.password.vue:
@@ -892,7 +900,6 @@ desktop/views/components/ui.header.vue:
   adjective: "M."
 desktop/views/components/ui.header.account.vue:
   profile: "Votre profil"
-  drive: "Drive"
   favorites: "Favorites"
   lists: "Listes"
   follow-requests: "Demandes de suivi"
@@ -936,7 +943,6 @@ desktop/views/components/window.vue:
   close: "Fermer"
 desktop/views/pages/admin/admin.vue:
   dashboard: "Tableau de bord"
-  drive: "Drive"
   users: "Utilisateur·rice·s"
   update: "Mises à jour"
   announcements: "お知らせ"
@@ -976,6 +982,12 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-view: "Vue média"
   edit: "Options"
 desktop/views/pages/deck/deck.user-column.vue:
+  posts: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+  images: "画像"
+  activity: "アクティビティ"
+  timeline: "タイムライン"
   pinned-notes: "ピン留めされた投稿"
   push-to-a-list: "リストに追加"
 desktop/views/pages/stats/stats.vue:
@@ -1043,6 +1055,9 @@ desktop/views/pages/user/user.profile.vue:
   mute: "Mettre en sourdine"
   muted: "Muting"
   unmute: "Enlever la sourdine"
+  block: "ブロックする"
+  unblock: "ブロック解除"
+  block-confirm: "このユーザーをブロックしますか？"
   push-to-a-list: "Ajouter à la liste"
   list-pushed: "Vous avez ajouté {user} à la liste {list}."
 desktop/views/pages/user/user.header.vue:
@@ -1083,7 +1098,6 @@ desktop/views/widgets/users.vue:
   refresh: "Afficher d'autres"
   no-one: "Personne"
 mobile/views/components/drive.vue:
-  drive: "Drive"
   used: "utilisé"
   folder-count: "Dossier(s)"
   count-separator: ", "
@@ -1187,7 +1201,6 @@ mobile/views/components/ui.nav.vue:
   messaging: "Messages"
   follow-requests: "Demandes d'abonnement"
   search: "Rechercher"
-  drive: "Drive"
   favorites: "Favoris"
   user-lists: "Listes"
   widgets: "Modules"
@@ -1210,7 +1223,6 @@ mobile/views/pages/user-lists.vue:
   title: "Listes"
   enter-list-name: "Nom de la liste"
 mobile/views/pages/drive.vue:
-  drive: "Drive"
   more: "Afficher plus ..."
 mobile/views/pages/signup.vue:
   lets-start: "Votre compte est prêt ! 📦"
@@ -1320,6 +1332,10 @@ mobile/views/pages/user.vue:
   timeline: "Fil d'actualité"
   media: "Media"
   is-suspended: "This account has been suspended."
+  mute: "ミュート"
+  unmute: "ミュート解除"
+  block: "ブロック"
+  unblock: "ブロック解除"
 mobile/views/pages/user/home.vue:
   recent-notes: "Notes récentes"
   images: "Images"

locales/it-IT.yml

@@ -62,6 +62,7 @@ common:
     years_ago: "{}年前"
   month-and-day: "{month}月 {day}日"
   trash: "ゴミ箱"
+  drive: "ドライブ"
   weekday-short:
     sunday: "日"
     monday: "月"
@@ -541,11 +542,14 @@ desktop/views/components/charts.vue:
   title: "チャート"
   per-day: "1日ごと"
   per-hour: "1時間ごと"
+  federation: "フェデレーション"
   notes: "投稿"
   users: "ユーザー"
   drive: "ドライブ"
   network: "ネットワーク"
   charts:
+    federation-instances: "インスタンスの増減"
+    federation-instances-total: "インスタンスの積算"
     notes: "投稿の増減 (統合)"
     local-notes: "投稿の増減 (ローカル)"
     remote-notes: "投稿の増減 (リモート)"
@@ -575,7 +579,6 @@ desktop/views/components/crop-window.vue:
   ok: "決定"
 desktop/views/components/drive-window.vue:
   used: "使用中"
-  drive: "ドライブ"
 desktop/views/components/drive.file.vue:
   avatar: "アイコン"
   banner: "バナー"
@@ -605,8 +608,6 @@ desktop/views/components/drive.folder.vue:
     rename: "名前を変更"
     rename-folder: "フォルダ名の変更"
     input-new-folder-name: "新しいフォルダ名を入力してください"
-desktop/views/components/drive.nav-folder.vue:
-  drive: "ドライブ"
 desktop/views/components/drive.vue:
   search: "検索"
   load-more: "もっと読み込む"
@@ -741,7 +742,6 @@ desktop/views/components/settings.vue:
   notification: "通知"
   apps: "アプリ"
   mute: "ミュート"
-  drive: "ドライブ"
   security: "セキュリティ"
   signin: "サインイン履歴"
   password: "パスワード"
@@ -847,18 +847,26 @@ desktop/views/components/settings.2fa.vue:
   success: "設定が完了しました！"
   failed: "設定に失敗しました。トークンに誤りがないかご確認ください。"
   info: "次回サインインからは、同様にパスワードに加えてデバイスに表示されているトークンを入力します。"
-desktop/views/components/settings.api.vue:
+common/views/components/api-settings.vue:
   intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
   caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
   regeneration-of-token: "万が一このトークンが漏れたりその可能性がある場合はトークンを再生成できます。"
   regenerate-token: "トークンを再生成"
   token: "Token:"
   enter-password: "パスワードを入力してください"
+  console:
+    title: 'APIコンソール'
+    endpoint: 'エンドポイント'
+    parameter: 'パラメータ'
+    send: '送信'
+    sending: '応答待ち'
+    response: '結果'
 desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
-desktop/views/components/settings.drive.vue:
-  max: "中"
+common/views/components/drive-settings.vue:
+  max: "容量"
   in-use: "使用中"
+  stats: "統計"
 desktop/views/components/settings.mute.vue:
   no-users: "ミュートしているユーザーはいません"
 desktop/views/components/settings.password.vue:
@@ -892,7 +900,6 @@ desktop/views/components/ui.header.vue:
   adjective: "さん"
 desktop/views/components/ui.header.account.vue:
   profile: "プロフィール"
-  drive: "ドライブ"
   favorites: "お気に入り"
   lists: "リスト"
   follow-requests: "フォロー申請"
@@ -936,7 +943,6 @@ desktop/views/components/window.vue:
   close: "閉じる"
 desktop/views/pages/admin/admin.vue:
   dashboard: "ダッシュボード"
-  drive: "ドライブ"
   users: "ユーザー"
   update: "更新"
   announcements: "お知らせ"
@@ -976,6 +982,12 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-view: "メディアビュー"
   edit: "オプション"
 desktop/views/pages/deck/deck.user-column.vue:
+  posts: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+  images: "画像"
+  activity: "アクティビティ"
+  timeline: "タイムライン"
   pinned-notes: "ピン留めされた投稿"
   push-to-a-list: "リストに追加"
 desktop/views/pages/stats/stats.vue:
@@ -1043,6 +1055,9 @@ desktop/views/pages/user/user.profile.vue:
   mute: "ミュートする"
   muted: "ミュートしています"
   unmute: "ミュート解除"
+  block: "ブロックする"
+  unblock: "ブロック解除"
+  block-confirm: "このユーザーをブロックしますか？"
   push-to-a-list: "リストに追加"
   list-pushed: "{user}を{list}に追加しました。"
 desktop/views/pages/user/user.header.vue:
@@ -1083,7 +1098,6 @@ desktop/views/widgets/users.vue:
   refresh: "他を見る"
   no-one: "いません！"
 mobile/views/components/drive.vue:
-  drive: "ドライブ"
   used: "使用中"
   folder-count: "フォルダ"
   count-separator: "、"
@@ -1187,7 +1201,6 @@ mobile/views/components/ui.nav.vue:
   messaging: "メッセージ"
   follow-requests: "フォロー申請"
   search: "検索"
-  drive: "ドライブ"
   favorites: "お気に入り"
   user-lists: "リスト"
   widgets: "ウィジェット"
@@ -1210,7 +1223,6 @@ mobile/views/pages/user-lists.vue:
   title: "リスト"
   enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
-  drive: "ドライブ"
   more: "もっと見る"
 mobile/views/pages/signup.vue:
   lets-start: "📦 始めましょう"
@@ -1320,6 +1332,10 @@ mobile/views/pages/user.vue:
   timeline: "タイムライン"
   media: "メディア"
   is-suspended: "このユーザーは凍結されています。"
+  mute: "ミュート"
+  unmute: "ミュート解除"
+  block: "ブロック"
+  unblock: "ブロック解除"
 mobile/views/pages/user/home.vue:
   recent-notes: "最近の投稿"
   images: "画像"

locales/ja-JP.yml

@@ -64,6 +64,7 @@ common:
   month-and-day: "{month}月 {day}日"
 
   trash: "ゴミ箱"
+  drive: "ドライブ"
 
   weekday-short:
     sunday: "日"
@@ -601,11 +602,14 @@ desktop/views/components/charts.vue:
   title: "チャート"
   per-day: "1日ごと"
   per-hour: "1時間ごと"
+  federation: "フェデレーション"
   notes: "投稿"
   users: "ユーザー"
   drive: "ドライブ"
   network: "ネットワーク"
   charts:
+    federation-instances: "インスタンスの増減"
+    federation-instances-total: "インスタンスの積算"
     notes: "投稿の増減 (統合)"
     local-notes: "投稿の増減 (ローカル)"
     remote-notes: "投稿の増減 (リモート)"
@@ -639,7 +643,6 @@ desktop/views/components/crop-window.vue:
 
 desktop/views/components/drive-window.vue:
   used: "使用中"
-  drive: "ドライブ"
 
 desktop/views/components/drive.file.vue:
   avatar: "アイコン"
@@ -672,9 +675,6 @@ desktop/views/components/drive.folder.vue:
     rename-folder: "フォルダ名の変更"
     input-new-folder-name: "新しいフォルダ名を入力してください"
 
-desktop/views/components/drive.nav-folder.vue:
-  drive: "ドライブ"
-
 desktop/views/components/drive.vue:
   search: "検索"
   load-more: "もっと読み込む"
@@ -833,7 +833,6 @@ desktop/views/components/settings.vue:
   notification: "通知"
   apps: "アプリ"
   mute: "ミュート"
-  drive: "ドライブ"
   security: "セキュリティ"
   signin: "サインイン履歴"
   password: "パスワード"
@@ -951,20 +950,28 @@ desktop/views/components/settings.2fa.vue:
   failed: "設定に失敗しました。トークンに誤りがないかご確認ください。"
   info: "次回サインインからは、同様にパスワードに加えてデバイスに表示されているトークンを入力します。"
 
-desktop/views/components/settings.api.vue:
+common/views/components/api-settings.vue:
   intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
   caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
   regeneration-of-token: "万が一このトークンが漏れたりその可能性がある場合はトークンを再生成できます。"
   regenerate-token: "トークンを再生成"
   token: "Token:"
   enter-password: "パスワードを入力してください"
+  console:
+    title: 'APIコンソール'
+    endpoint: 'エンドポイント'
+    parameter: 'パラメータ'
+    send: '送信'
+    sending: '応答待ち'
+    response: '結果'
 
 desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
 
-desktop/views/components/settings.drive.vue:
-  max: "中"
+common/views/components/drive-settings.vue:
+  max: "容量"
   in-use: "使用中"
+  stats: "統計"
 
 desktop/views/components/settings.mute.vue:
   no-users: "ミュートしているユーザーはいません"
@@ -1005,7 +1012,6 @@ desktop/views/components/ui.header.vue:
 
 desktop/views/components/ui.header.account.vue:
   profile: "プロフィール"
-  drive: "ドライブ"
   favorites: "お気に入り"
   lists: "リスト"
   follow-requests: "フォロー申請"
@@ -1060,7 +1066,6 @@ desktop/views/components/window.vue:
 
 desktop/views/pages/admin/admin.vue:
   dashboard: "ダッシュボード"
-  drive: "ドライブ"
   users: "ユーザー"
   update: "更新"
   announcements: "お知らせ"
@@ -1109,6 +1114,12 @@ desktop/views/pages/deck/deck.tl-column.vue:
   edit: "オプション"
 
 desktop/views/pages/deck/deck.user-column.vue:
+  posts: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+  images: "画像"
+  activity: "アクティビティ"
+  timeline: "タイムライン"
   pinned-notes: "ピン留めされた投稿"
   push-to-a-list: "リストに追加"
 
@@ -1192,6 +1203,9 @@ desktop/views/pages/user/user.profile.vue:
   mute: "ミュートする"
   muted: "ミュートしています"
   unmute: "ミュート解除"
+  block: "ブロックする"
+  unblock: "ブロック解除"
+  block-confirm: "このユーザーをブロックしますか？"
   push-to-a-list: "リストに追加"
   list-pushed: "{user}を{list}に追加しました。"
 
@@ -1242,7 +1256,6 @@ desktop/views/widgets/users.vue:
   no-one: "いません！"
 
 mobile/views/components/drive.vue:
-  drive: "ドライブ"
   used: "使用中"
   folder-count: "フォルダ"
   count-separator: "、"
@@ -1366,7 +1379,6 @@ mobile/views/components/ui.nav.vue:
   messaging: "メッセージ"
   follow-requests: "フォロー申請"
   search: "検索"
-  drive: "ドライブ"
   favorites: "お気に入り"
   user-lists: "リスト"
   widgets: "ウィジェット"
@@ -1394,7 +1406,6 @@ mobile/views/pages/user-lists.vue:
   enter-list-name: "リスト名を入力してください"
 
 mobile/views/pages/drive.vue:
-  drive: "ドライブ"
   more: "もっと見る"
 
 mobile/views/pages/signup.vue:
@@ -1523,6 +1534,10 @@ mobile/views/pages/user.vue:
   timeline: "タイムライン"
   media: "メディア"
   is-suspended: "このユーザーは凍結されています。"
+  mute: "ミュート"
+  unmute: "ミュート解除"
+  block: "ブロック"
+  unblock: "ブロック解除"
 
 mobile/views/pages/user/home.vue:
   recent-notes: "最近の投稿"

locales/ja-KS.yml

@@ -62,6 +62,7 @@ common:
     years_ago: "{}年前"
   month-and-day: "{month}月 {day}日"
   trash: "ゴミ箱"
+  drive: "ドライブ"
   weekday-short:
     sunday: "日"
     monday: "月"
@@ -541,11 +542,14 @@ desktop/views/components/charts.vue:
   title: "チャート"
   per-day: "1日ごと"
   per-hour: "1時間ごと"
+  federation: "フェデレーション"
   notes: "投稿"
   users: "ユーザー"
   drive: "ドライブ"
   network: "ネットワーク"
   charts:
+    federation-instances: "インスタンスの増減"
+    federation-instances-total: "インスタンスの積算"
     notes: "投稿の増減(統合)"
     local-notes: "投稿の増減 (ローカル)"
     remote-notes: "投稿の増減 (リモート)"
@@ -575,7 +579,6 @@ desktop/views/components/crop-window.vue:
   ok: "そうする"
 desktop/views/components/drive-window.vue:
   used: "使うとる"
-  drive: "ドライブ"
 desktop/views/components/drive.file.vue:
   avatar: "アイコン"
   banner: "バナー"
@@ -605,8 +608,6 @@ desktop/views/components/drive.folder.vue:
     rename: "名前を変えるで"
     rename-folder: "フォルダ名を変えるで"
     input-new-folder-name: "新しいフォルダ名を入力してや"
-desktop/views/components/drive.nav-folder.vue:
-  drive: "ドライブ"
 desktop/views/components/drive.vue:
   search: "検索"
   load-more: "もっとあらへんのか！"
@@ -741,7 +742,6 @@ desktop/views/components/settings.vue:
   notification: "通知"
   apps: "アプリ"
   mute: "ミュート"
-  drive: "ドライブ"
   security: "守護神セキュリティ"
   signin: "こんな感じでサインインしたらしいで"
   password: "パスワード"
@@ -847,18 +847,26 @@ desktop/views/components/settings.2fa.vue:
   success: "設定が完了したで！"
   failed: "なんか設定に失敗したで。トークンを間違えとらんか確認してや。"
   info: "次のサインインからは、パスワードに加えてデバイスに出とるトークンを入力してな。"
-desktop/views/components/settings.api.vue:
-  intro: "APIを利用するには、上記のトークンを「i」っちゅうキーでパラメータに付加してリクエストしてや。"
-  caution: "アカウントを不正利用されるかも知れんから、このトークンは第三者に教えたらあかんで(アプリなどにも入力しんといてな)。"
-  regeneration-of-token: "万が一このトークンが漏れたとかその可能性があったらトークンを再生成できるで。"
-  regenerate-token: "トークンを再生成"
-  token: "トークン:"
-  enter-password: "パスワードを入力してや"
+common/views/components/api-settings.vue:
+  intro: "API使うんやったらこのトークンを「i」っちゅうパラメータにくっつけてリクエストできるで。"
+  caution: "アカウント勝手にいじられるかも知れんから、このトークンは教えたらあかんし、アプリにも書いたらあかんで(これはフリちゃうで)"
+  regeneration-of-token: "トークン漏れてもうたんやったらもっかい生成できるで。"
+  regenerate-token: "トークンもっかい生成"
+  token: "Token:"
+  enter-password: "パスワードを入れてや"
+  console:
+    title: 'APIコンソール'
+    endpoint: 'エンドポイント'
+    parameter: 'パラメータ'
+    send: '送る'
+    sending: '応答待っとる'
+    response: 'こんなん返ってきたわ'
 desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはあらへんで"
-desktop/views/components/settings.drive.vue:
-  max: "中"
-  in-use: "使用中"
+common/views/components/drive-settings.vue:
+  max: "容量"
+  in-use: "使うとる"
+  stats: "統計"
 desktop/views/components/settings.mute.vue:
   no-users: "ミュートしているユーザーはおらんで"
 desktop/views/components/settings.password.vue:
@@ -892,7 +900,6 @@ desktop/views/components/ui.header.vue:
   adjective: "はん"
 desktop/views/components/ui.header.account.vue:
   profile: "プロフィール"
-  drive: "ドライブ"
   favorites: "お気に入り"
   lists: "リスト"
   follow-requests: "フォロー許してくれや！言うてみる"
@@ -936,10 +943,9 @@ desktop/views/components/window.vue:
   close: "さいなら"
 desktop/views/pages/admin/admin.vue:
   dashboard: "ダッシュボード"
-  drive: "ドライブ"
   users: "ユーザー"
   update: "更新"
-  announcements: "お知らせ"
+  announcements: "知っといてや"
   hashtags: "ハッシュタグ"
 desktop/views/pages/admin/admin.dashboard.vue:
   dashboard: "ダッシュボード"
@@ -968,7 +974,7 @@ desktop/views/pages/admin/admin.unverify-user.vue:
   unverify: "公式アカウントにはさせへんで"
   unverified: "公式アカウントを解除したで"
 desktop/views/pages/admin/admin.announcements.vue:
-  announcements: "お知らせ"
+  announcements: "知っといてや"
 desktop/views/pages/admin/admin.hashtags.vue:
   hided-tags: "Hidden Tags"
 desktop/views/pages/deck/deck.tl-column.vue:
@@ -976,8 +982,14 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-view: "メディアビュー"
   edit: "オプション"
 desktop/views/pages/deck/deck.user-column.vue:
-  pinned-notes: "ピン留めされた投稿"
-  push-to-a-list: "リストに追加"
+  posts: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+  images: "画像"
+  activity: "やっとること"
+  timeline: "タイムライン"
+  pinned-notes: "ピン留めしはった投稿"
+  push-to-a-list: "リストに入れたる"
 desktop/views/pages/stats/stats.vue:
   all-users: "全てのユーザー"
   original-users: "ここの人らだけ"
@@ -1030,7 +1042,7 @@ desktop/views/pages/user/user.friends.vue:
   no-users: "よう話すツレは居らん"
 desktop/views/pages/user/user.vue:
   is-suspended: "このユーザーはあかんわ。凍結されとる。"
-  last-used-at: "最終アクセス"
+  last-used-at: "最後いつ来はった？"
 desktop/views/pages/user/user.photos.vue:
   title: "写真"
   loading: "読み込んどります"
@@ -1043,6 +1055,9 @@ desktop/views/pages/user/user.profile.vue:
   mute: "ミュートする"
   muted: "ミュートしとるで"
   unmute: "ミュート解除"
+  block: "ブロックする"
+  unblock: "ブロック解除"
+  block-confirm: "このユーザーをブロックしますか？"
   push-to-a-list: "リストに追加"
   list-pushed: "{user}を{list}に追加したで。"
 desktop/views/pages/user/user.header.vue:
@@ -1083,7 +1098,6 @@ desktop/views/widgets/users.vue:
   refresh: "他を見る"
   no-one: "おらん！"
 mobile/views/components/drive.vue:
-  drive: "ドライブ"
   used: "使うとる"
   folder-count: "フォルダ"
   count-separator: "、"
@@ -1113,8 +1127,8 @@ mobile/views/components/drive.file-detail.vue:
   hash: "ハッシュ(md5)"
   exif: "EXIF"
   nsfw: "ちょっと見せられへんわ"
-  mark-as-sensitive: "閲覧注意に設定"
-  unmark-as-sensitive: "閲覧注意を解除"
+  mark-as-sensitive: "見たらあかん感じにしとく"
+  unmark-as-sensitive: "やっぱ見せたるわ"
 mobile/views/components/media-image.vue:
   sensitive: "見たらあかんで"
   click-to-show: "押してみ、見せたるわ"
@@ -1187,7 +1201,6 @@ mobile/views/components/ui.nav.vue:
   messaging: "メッセージ"
   follow-requests: "フォロー許してくれや！言うてみる"
   search: "検索"
-  drive: "ドライブ"
   favorites: "お気に入り"
   user-lists: "リスト"
   widgets: "ウィジェット"
@@ -1210,7 +1223,6 @@ mobile/views/pages/user-lists.vue:
   title: "リスト"
   enter-list-name: "リスト名を入力してや"
 mobile/views/pages/drive.vue:
-  drive: "ドライブ"
   more: "もっとあるやろ！"
 mobile/views/pages/signup.vue:
   lets-start: "📦 始めようや"
@@ -1310,7 +1322,7 @@ mobile/views/pages/settings.vue:
   signout: "さいなら"
   sound: "サウンド"
   enable-sounds: "サウンド鳴らす"
-  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
+  mark-as-read-all-unread-notes: "全部もう読んだわ"
 mobile/views/pages/user.vue:
   follows-you: "フォローされとるで"
   following: "フォロー"
@@ -1320,6 +1332,10 @@ mobile/views/pages/user.vue:
   timeline: "タイムライン"
   media: "メディア"
   is-suspended: "このユーザーはあかんわ。凍結されとる。"
+  mute: "ミュート"
+  unmute: "ミュート解除"
+  block: "ブロック"
+  unblock: "ブロック解除"
 mobile/views/pages/user/home.vue:
   recent-notes: "最近儲かりまっか？"
   images: "画像"
@@ -1367,27 +1383,27 @@ dev/views/index.vue:
   manage-apps: "アプリの管理"
 dev/views/apps.vue:
   manage-apps: "アプリを管理"
-  create-app: "アプリ作成"
-  app-missing: "アプリなし"
+  create-app: "アプリ作る"
+  app-missing: "アプリあらへん"
 dev/views/new-app.vue:
-  create-app: "アプリケーションの作成"
-  app-name: "アプリケーション名"
-  app-name-desc: "あなたのアプリの名称。"
-  app-name-ex: "ex) Misskey for iOS"
-  app-overview: "アプリの概要"
-  app-desc: "あなたのアプリの簡単な説明や紹介。"
-  app-desc-ex: "ex) Misskey iOSクライアント。"
-  callback-url: "コールバックURL (オプション)"
-  callback-url-desc: "ユーザーが認証フォームで認証した際にリダイレクトするURLを設定できます。"
+  create-app: "アプリケーション作る"
+  app-name: "アプリケーションの名前"
+  app-name-desc: "あんたのアプリの名前。"
+  app-name-ex: "ex) 関西ミスキー保安協会"
+  app-overview: "このアプリどんなん？"
+  app-desc: "あんたのアプリどんなんか教えて"
+  app-desc-ex: "ex) 関西人なら誰でも口ずさめるこのCMがついにMisskeyへ。"
+  callback-url: "コールバックURL (無くてもええで)"
+  callback-url-desc: "ユーザーが認証フォームで認証した後どこに連れてくかを設定できるで"
   authority: "権限"
-  authority-desc: "ここで要求した機能だけがAPIからアクセスできます。"
-  authority-warning: "アプリ作成後も変更できますが、新たな権限を付与する場合、その時点で関連付けられているユーザーキーはすべて無効になります。"
-  account-read: "アカウントの情報を見る。"
-  account-write: "アカウントの情報を操作する。"
-  note-write: "投稿する。"
-  reaction-write: "リアクションしたりリアクションをキャンセルする。"
-  following-write: "フォローしたりフォロー解除する。"
-  drive-read: "ドライブを見る。"
-  drive-write: "ドライブを操作する。"
-  notification-read: "通知を見る。"
-  notification-write: "通知を操作する。"
+  authority-desc: "ここにチェックした機能しかAPIからアクセスできひんから気ぃつけてな"
+  authority-warning: "アプリ作った後でも変えれるけど、新しいやつ追加したらそん時関連付いてるユーザーキーは全部ほかされるで。"
+  account-read: "アカウントの情報見せて"
+  account-write: "アカウントの情報いじらせて"
+  note-write: "投稿させて"
+  reaction-write: "リアクションしたりそれをキャンセルさせて"
+  following-write: "フォローとかフォロー解除させて"
+  drive-read: "ドライブ見せて"
+  drive-write: "ドライブいじらせて"
+  notification-read: "通知見せて"
+  notification-write: "通知いじらせて"

locales/ko-KR.yml

@@ -62,6 +62,7 @@ common:
     years_ago: "{}년전"
   month-and-day: "{month}월 {day}일"
   trash: "휴지통"
+  drive: "ドライブ"
   weekday-short:
     sunday: "일"
     monday: "월"
@@ -541,11 +542,14 @@ desktop/views/components/charts.vue:
   title: "チャート"
   per-day: "1日ごと"
   per-hour: "1時間ごと"
+  federation: "フェデレーション"
   notes: "投稿"
   users: "ユーザー"
   drive: "ドライブ"
   network: "ネットワーク"
   charts:
+    federation-instances: "インスタンスの増減"
+    federation-instances-total: "インスタンスの積算"
     notes: "投稿の増減 (統合)"
     local-notes: "投稿の増減 (ローカル)"
     remote-notes: "投稿の増減 (リモート)"
@@ -575,7 +579,6 @@ desktop/views/components/crop-window.vue:
   ok: "決定"
 desktop/views/components/drive-window.vue:
   used: "使用中"
-  drive: "ドライブ"
 desktop/views/components/drive.file.vue:
   avatar: "アイコン"
   banner: "バナー"
@@ -605,8 +608,6 @@ desktop/views/components/drive.folder.vue:
     rename: "名前を変更"
     rename-folder: "フォルダ名の変更"
     input-new-folder-name: "新しいフォルダ名を入力してください"
-desktop/views/components/drive.nav-folder.vue:
-  drive: "ドライブ"
 desktop/views/components/drive.vue:
   search: "検索"
   load-more: "もっと読み込む"
@@ -741,7 +742,6 @@ desktop/views/components/settings.vue:
   notification: "通知"
   apps: "アプリ"
   mute: "ミュート"
-  drive: "ドライブ"
   security: "セキュリティ"
   signin: "サインイン履歴"
   password: "パスワード"
@@ -847,18 +847,26 @@ desktop/views/components/settings.2fa.vue:
   success: "設定が完了しました！"
   failed: "設定に失敗しました。トークンに誤りがないかご確認ください。"
   info: "次回サインインからは、同様にパスワードに加えてデバイスに表示されているトークンを入力します。"
-desktop/views/components/settings.api.vue:
+common/views/components/api-settings.vue:
   intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
   caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
   regeneration-of-token: "万が一このトークンが漏れたりその可能性がある場合はトークンを再生成できます。"
   regenerate-token: "トークンを再生成"
   token: "Token:"
   enter-password: "パスワードを入力してください"
+  console:
+    title: 'APIコンソール'
+    endpoint: 'エンドポイント'
+    parameter: 'パラメータ'
+    send: '送信'
+    sending: '応答待ち'
+    response: '結果'
 desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
-desktop/views/components/settings.drive.vue:
-  max: "中"
+common/views/components/drive-settings.vue:
+  max: "容量"
   in-use: "使用中"
+  stats: "統計"
 desktop/views/components/settings.mute.vue:
   no-users: "ミュートしているユーザーはいません"
 desktop/views/components/settings.password.vue:
@@ -892,7 +900,6 @@ desktop/views/components/ui.header.vue:
   adjective: "さん"
 desktop/views/components/ui.header.account.vue:
   profile: "プロフィール"
-  drive: "ドライブ"
   favorites: "お気に入り"
   lists: "リスト"
   follow-requests: "フォロー申請"
@@ -936,7 +943,6 @@ desktop/views/components/window.vue:
   close: "閉じる"
 desktop/views/pages/admin/admin.vue:
   dashboard: "ダッシュボード"
-  drive: "ドライブ"
   users: "ユーザー"
   update: "更新"
   announcements: "お知らせ"
@@ -976,6 +982,12 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-view: "メディアビュー"
   edit: "オプション"
 desktop/views/pages/deck/deck.user-column.vue:
+  posts: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+  images: "画像"
+  activity: "アクティビティ"
+  timeline: "タイムライン"
   pinned-notes: "ピン留めされた投稿"
   push-to-a-list: "リストに追加"
 desktop/views/pages/stats/stats.vue:
@@ -1043,6 +1055,9 @@ desktop/views/pages/user/user.profile.vue:
   mute: "ミュートする"
   muted: "ミュートしています"
   unmute: "ミュート解除"
+  block: "ブロックする"
+  unblock: "ブロック解除"
+  block-confirm: "このユーザーをブロックしますか？"
   push-to-a-list: "リストに追加"
   list-pushed: "{user}を{list}に追加しました。"
 desktop/views/pages/user/user.header.vue:
@@ -1083,7 +1098,6 @@ desktop/views/widgets/users.vue:
   refresh: "他を見る"
   no-one: "いません！"
 mobile/views/components/drive.vue:
-  drive: "ドライブ"
   used: "使用中"
   folder-count: "フォルダ"
   count-separator: "、"
@@ -1187,7 +1201,6 @@ mobile/views/components/ui.nav.vue:
   messaging: "メッセージ"
   follow-requests: "フォロー申請"
   search: "検索"
-  drive: "ドライブ"
   favorites: "お気に入り"
   user-lists: "リスト"
   widgets: "ウィジェット"
@@ -1210,7 +1223,6 @@ mobile/views/pages/user-lists.vue:
   title: "リスト"
   enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
-  drive: "ドライブ"
   more: "もっと見る"
 mobile/views/pages/signup.vue:
   lets-start: "📦 始めましょう"
@@ -1320,6 +1332,10 @@ mobile/views/pages/user.vue:
   timeline: "タイムライン"
   media: "メディア"
   is-suspended: "このユーザーは凍結されています。"
+  mute: "ミュート"
+  unmute: "ミュート解除"
+  block: "ブロック"
+  unblock: "ブロック解除"
 mobile/views/pages/user/home.vue:
   recent-notes: "最近の投稿"
   images: "画像"

locales/nl-NL.yml

@@ -62,6 +62,7 @@ common:
     years_ago: "{}jaar geleden"
   month-and-day: "{month}月 {day}日"
   trash: "ゴミ箱"
+  drive: "ドライブ"
   weekday-short:
     sunday: "Z"
     monday: "M"
@@ -541,11 +542,14 @@ desktop/views/components/charts.vue:
   title: "チャート"
   per-day: "1日ごと"
   per-hour: "1時間ごと"
+  federation: "フェデレーション"
   notes: "投稿"
   users: "ユーザー"
   drive: "ドライブ"
   network: "ネットワーク"
   charts:
+    federation-instances: "インスタンスの増減"
+    federation-instances-total: "インスタンスの積算"
     notes: "投稿の増減 (統合)"
     local-notes: "投稿の増減 (ローカル)"
     remote-notes: "投稿の増減 (リモート)"
@@ -575,7 +579,6 @@ desktop/views/components/crop-window.vue:
   ok: "Oké"
 desktop/views/components/drive-window.vue:
   used: "gebruikt"
-  drive: "Drive"
 desktop/views/components/drive.file.vue:
   avatar: "Gebruikersafbeelding"
   banner: "Omslagfoto"
@@ -605,8 +608,6 @@ desktop/views/components/drive.folder.vue:
     rename: "Naam wijzigen"
     rename-folder: "Mapnaam wijzigen"
     input-new-folder-name: "Voer een nieuwe naam in"
-desktop/views/components/drive.nav-folder.vue:
-  drive: "Drive"
 desktop/views/components/drive.vue:
   search: "Zoeken"
   load-more: "Meer laden"
@@ -741,7 +742,6 @@ desktop/views/components/settings.vue:
   notification: "Melding"
   apps: "Apps"
   mute: "Dempen"
-  drive: "Drive"
   security: "Beveiliging"
   signin: "Inloggeschiedenis"
   password: "Wachtwoord"
@@ -847,18 +847,26 @@ desktop/views/components/settings.2fa.vue:
   success: "Instellen voltooid!"
   failed: "Instellen mislukt. Zorg ervoor dat de sleutel juist is."
   info: "Vanaf nu moet je ook de op je apparaat getoonde sleutel tonen bij het inloggen op Misskey."
-desktop/views/components/settings.api.vue:
-  intro: "Als je toegang wilt tot de API, stel deze sleutel dan in als 'i' bij de verzoekparameters."
-  caution: "Laat deze sleutel niet zien aan derde partijen (en voer hem nergens anders in dan hier), anders kan je account gehackt worden."
-  regeneration-of-token: "Mocht deze sleutel tóch uitlekken, dan kun je hem opnieuw genereren."
-  regenerate-token: "Sleutel opnieuw genereren"
-  token: "Sleutel:"
-  enter-password: "Voer je wachtwoord in"
+common/views/components/api-settings.vue:
+  intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
+  caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
+  regeneration-of-token: "万が一このトークンが漏れたりその可能性がある場合はトークンを再生成できます。"
+  regenerate-token: "トークンを再生成"
+  token: "Token:"
+  enter-password: "パスワードを入力してください"
+  console:
+    title: 'APIコンソール'
+    endpoint: 'エンドポイント'
+    parameter: 'パラメータ'
+    send: '送信'
+    sending: '応答待ち'
+    response: '結果'
 desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
-desktop/views/components/settings.drive.vue:
-  max: "中"
+common/views/components/drive-settings.vue:
+  max: "容量"
   in-use: "使用中"
+  stats: "統計"
 desktop/views/components/settings.mute.vue:
   no-users: "Geen gedempte gebruikers"
 desktop/views/components/settings.password.vue:
@@ -892,7 +900,6 @@ desktop/views/components/ui.header.vue:
   adjective: "さん"
 desktop/views/components/ui.header.account.vue:
   profile: "Je profiel"
-  drive: "Drive"
   favorites: "Favorieten"
   lists: "Lijsten"
   follow-requests: "フォロー申請"
@@ -936,7 +943,6 @@ desktop/views/components/window.vue:
   close: "Sluiten"
 desktop/views/pages/admin/admin.vue:
   dashboard: "ダッシュボード"
-  drive: "ドライブ"
   users: "ユーザー"
   update: "更新"
   announcements: "お知らせ"
@@ -976,6 +982,12 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-view: "メディアビュー"
   edit: "オプション"
 desktop/views/pages/deck/deck.user-column.vue:
+  posts: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+  images: "画像"
+  activity: "アクティビティ"
+  timeline: "タイムライン"
   pinned-notes: "ピン留めされた投稿"
   push-to-a-list: "リストに追加"
 desktop/views/pages/stats/stats.vue:
@@ -1043,6 +1055,9 @@ desktop/views/pages/user/user.profile.vue:
   mute: "Dempen"
   muted: "Dempend"
   unmute: "Ontdempen"
+  block: "ブロックする"
+  unblock: "ブロック解除"
+  block-confirm: "このユーザーをブロックしますか？"
   push-to-a-list: "リストに追加"
   list-pushed: "{user}を{list}に追加しました。"
 desktop/views/pages/user/user.header.vue:
@@ -1083,7 +1098,6 @@ desktop/views/widgets/users.vue:
   refresh: "Anderen tonen"
   no-one: "Niemand"
 mobile/views/components/drive.vue:
-  drive: "Drive"
   used: "gebruikt"
   folder-count: "Map(pen)"
   count-separator: ", "
@@ -1187,7 +1201,6 @@ mobile/views/components/ui.nav.vue:
   messaging: "Gesprekken"
   follow-requests: "フォロー申請"
   search: "Zoeken"
-  drive: "Drive"
   favorites: "お気に入り"
   user-lists: "リスト"
   widgets: "ウィジェット"
@@ -1210,7 +1223,6 @@ mobile/views/pages/user-lists.vue:
   title: "リスト"
   enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
-  drive: "Drive"
   more: "もっと見る"
 mobile/views/pages/signup.vue:
   lets-start: "📦 始めましょう"
@@ -1320,6 +1332,10 @@ mobile/views/pages/user.vue:
   timeline: "Tijdlijn"
   media: "Media"
   is-suspended: "Dit account is geschorst."
+  mute: "ミュート"
+  unmute: "ミュート解除"
+  block: "ブロック"
+  unblock: "ブロック解除"
 mobile/views/pages/user/home.vue:
   recent-notes: "Recente notities"
   images: "Afbeeldingen"

locales/no-NO.yml

@@ -62,6 +62,7 @@ common:
     years_ago: "{} år siden"
   month-and-day: "{day}/{month}"
   trash: "Papirkurv"
+  drive: "ドライブ"
   weekday-short:
     sunday: "S"
     monday: "M"
@@ -541,11 +542,14 @@ desktop/views/components/charts.vue:
   title: "Diagrammer"
   per-day: "per dag"
   per-hour: "1時間ごと"
+  federation: "フェデレーション"
   notes: "Innlegg"
   users: "Brukere"
   drive: "Disk"
   network: "ネットワーク"
   charts:
+    federation-instances: "インスタンスの増減"
+    federation-instances-total: "インスタンスの積算"
     notes: "投稿の増減 (統合)"
     local-notes: "投稿の増減 (ローカル)"
     remote-notes: "投稿の増減 (リモート)"
@@ -575,7 +579,6 @@ desktop/views/components/crop-window.vue:
   ok: "Ok"
 desktop/views/components/drive-window.vue:
   used: "brukt"
-  drive: "Disk"
 desktop/views/components/drive.file.vue:
   avatar: "Avatar"
   banner: "Banner"
@@ -605,8 +608,6 @@ desktop/views/components/drive.folder.vue:
     rename: "Endre navn"
     rename-folder: "フォルダ名の変更"
     input-new-folder-name: "新しいフォルダ名を入力してください"
-desktop/views/components/drive.nav-folder.vue:
-  drive: "Disk"
 desktop/views/components/drive.vue:
   search: "Søk"
   load-more: "もっと読み込む"
@@ -741,7 +742,6 @@ desktop/views/components/settings.vue:
   notification: "Notifikasjon"
   apps: "Apper"
   mute: "Demp"
-  drive: "Disk"
   security: "セキュリティ"
   signin: "サインイン履歴"
   password: "Passord"
@@ -847,18 +847,26 @@ desktop/views/components/settings.2fa.vue:
   success: "設定が完了しました！"
   failed: "設定に失敗しました。トークンに誤りがないかご確認ください。"
   info: "次回サインインからは、同様にパスワードに加えてデバイスに表示されているトークンを入力します。"
-desktop/views/components/settings.api.vue:
+common/views/components/api-settings.vue:
   intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
   caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
   regeneration-of-token: "万が一このトークンが漏れたりその可能性がある場合はトークンを再生成できます。"
   regenerate-token: "トークンを再生成"
   token: "Token:"
   enter-password: "パスワードを入力してください"
+  console:
+    title: 'APIコンソール'
+    endpoint: 'エンドポイント'
+    parameter: 'パラメータ'
+    send: '送信'
+    sending: '応答待ち'
+    response: '結果'
 desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
-desktop/views/components/settings.drive.vue:
-  max: "Maks"
-  in-use: "I bruk"
+common/views/components/drive-settings.vue:
+  max: "容量"
+  in-use: "使用中"
+  stats: "統計"
 desktop/views/components/settings.mute.vue:
   no-users: "ミュートしているユーザーはいません"
 desktop/views/components/settings.password.vue:
@@ -892,7 +900,6 @@ desktop/views/components/ui.header.vue:
   adjective: "-san"
 desktop/views/components/ui.header.account.vue:
   profile: "プロフィール"
-  drive: "Disk"
   favorites: "Favoritter"
   lists: "Lister"
   follow-requests: "フォロー申請"
@@ -936,7 +943,6 @@ desktop/views/components/window.vue:
   close: "Lukk"
 desktop/views/pages/admin/admin.vue:
   dashboard: "ダッシュボード"
-  drive: "Disk"
   users: "Brukere"
   update: "Oppdater"
   announcements: "お知らせ"
@@ -976,6 +982,12 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-view: "メディアビュー"
   edit: "オプション"
 desktop/views/pages/deck/deck.user-column.vue:
+  posts: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+  images: "画像"
+  activity: "アクティビティ"
+  timeline: "タイムライン"
   pinned-notes: "ピン留めされた投稿"
   push-to-a-list: "リストに追加"
 desktop/views/pages/stats/stats.vue:
@@ -1043,6 +1055,9 @@ desktop/views/pages/user/user.profile.vue:
   mute: "ミュートする"
   muted: "ミュートしています"
   unmute: "ミュート解除"
+  block: "ブロックする"
+  unblock: "ブロック解除"
+  block-confirm: "このユーザーをブロックしますか？"
   push-to-a-list: "リストに追加"
   list-pushed: "{user}を{list}に追加しました。"
 desktop/views/pages/user/user.header.vue:
@@ -1083,7 +1098,6 @@ desktop/views/widgets/users.vue:
   refresh: "Oppdater"
   no-one: "Ingen"
 mobile/views/components/drive.vue:
-  drive: "Disk"
   used: "brukt"
   folder-count: "Mappe(r)"
   count-separator: ","
@@ -1187,7 +1201,6 @@ mobile/views/components/ui.nav.vue:
   messaging: "Meldinger"
   follow-requests: "フォロー申請"
   search: "Søk"
-  drive: "Disk"
   favorites: "Favoritter"
   user-lists: "Lister"
   widgets: "ウィジェット"
@@ -1210,7 +1223,6 @@ mobile/views/pages/user-lists.vue:
   title: "Lister"
   enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
-  drive: "Disk"
   more: "Vis mer"
 mobile/views/pages/signup.vue:
   lets-start: "📦 始めましょう"
@@ -1320,6 +1332,10 @@ mobile/views/pages/user.vue:
   timeline: "タイムライン"
   media: "Media"
   is-suspended: "このユーザーは凍結されています。"
+  mute: "ミュート"
+  unmute: "ミュート解除"
+  block: "ブロック"
+  unblock: "ブロック解除"
 mobile/views/pages/user/home.vue:
   recent-notes: "Nylige innlegg"
   images: "Bilder"

locales/pl-PL.yml

@@ -62,6 +62,7 @@ common:
     years_ago: "{} lat temu"
   month-and-day: "{month}-{day}"
   trash: "Kosz"
+  drive: "ドライブ"
   weekday-short:
     sunday: "N"
     monday: "Pn"
@@ -541,11 +542,14 @@ desktop/views/components/charts.vue:
   title: "チャート"
   per-day: "1日ごと"
   per-hour: "1時間ごと"
+  federation: "フェデレーション"
   notes: "投稿"
   users: "ユーザー"
   drive: "ドライブ"
   network: "ネットワーク"
   charts:
+    federation-instances: "インスタンスの増減"
+    federation-instances-total: "インスタンスの積算"
     notes: "投稿の増減 (統合)"
     local-notes: "投稿の増減 (ローカル)"
     remote-notes: "投稿の増減 (リモート)"
@@ -575,7 +579,6 @@ desktop/views/components/crop-window.vue:
   ok: "OK"
 desktop/views/components/drive-window.vue:
   used: "wykorzystane"
-  drive: "Dysk"
 desktop/views/components/drive.file.vue:
   avatar: "Awatar"
   banner: "Baner"
@@ -605,8 +608,6 @@ desktop/views/components/drive.folder.vue:
     rename: "Zmień nazwę"
     rename-folder: "Zmień nazwę katalogu"
     input-new-folder-name: "Wprowadź nową nazwę"
-desktop/views/components/drive.nav-folder.vue:
-  drive: "Dysk"
 desktop/views/components/drive.vue:
   search: "Szukaj"
   load-more: "Załaduj więcej"
@@ -741,7 +742,6 @@ desktop/views/components/settings.vue:
   notification: "Powiadomienia"
   apps: "Aplikacje"
   mute: "Wyciszanie"
-  drive: "Dysk"
   security: "Bezpieczeństwo"
   signin: "Historia logowań"
   password: "Hasło"
@@ -847,18 +847,26 @@ desktop/views/components/settings.2fa.vue:
   success: "Pomyślnie ukończono konfigurację!"
   failed: "Nie udało się skonfigurować uwierzytelniania dwuetapowego, upewnij się że wprowadziłeś prawidłowy token."
   info: "Od teraz, wprowadzaj token wyświetlany na urządzeniu przy każdym logowaniu do Misskey."
-desktop/views/components/settings.api.vue:
-  intro: "Aby uzyskać dostęp do API, ustaw ten token jako klucz 'i' parametrów żądań."
-  caution: "Nie pokazuj tego tokenu osobom trzecim (nie wprowadzaj go nigdzie indziej), aby konto nie trafiło w niepowołane ręce."
-  regeneration-of-token: "W przypadku wycieku tokenu, możesz wygenerować nowy."
-  regenerate-token: "Wygeneruj nowy token"
+common/views/components/api-settings.vue:
+  intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
+  caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
+  regeneration-of-token: "万が一このトークンが漏れたりその可能性がある場合はトークンを再生成できます。"
+  regenerate-token: "トークンを再生成"
   token: "Token:"
-  enter-password: "Wprowadź hasło"
+  enter-password: "パスワードを入力してください"
+  console:
+    title: 'APIコンソール'
+    endpoint: 'エンドポイント'
+    parameter: 'パラメータ'
+    send: '送信'
+    sending: '応答待ち'
+    response: '結果'
 desktop/views/components/settings.apps.vue:
   no-apps: "Brak zautoryzowanych aplikacji"
-desktop/views/components/settings.drive.vue:
-  max: "Maksymalnie"
-  in-use: " w użyciu."
+common/views/components/drive-settings.vue:
+  max: "容量"
+  in-use: "使用中"
+  stats: "統計"
 desktop/views/components/settings.mute.vue:
   no-users: "Brak wyciszonych użytkowników"
 desktop/views/components/settings.password.vue:
@@ -892,7 +900,6 @@ desktop/views/components/ui.header.vue:
   adjective: "さん"
 desktop/views/components/ui.header.account.vue:
   profile: "Twój profil"
-  drive: "Dysk"
   favorites: "Ulubione"
   lists: "Listy"
   follow-requests: "Prośby o śledzenie"
@@ -936,7 +943,6 @@ desktop/views/components/window.vue:
   close: "Zamknij"
 desktop/views/pages/admin/admin.vue:
   dashboard: "ダッシュボード"
-  drive: "ドライブ"
   users: "ユーザー"
   update: "更新"
   announcements: "お知らせ"
@@ -976,6 +982,12 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-view: "Widok multimediów"
   edit: "Opcje"
 desktop/views/pages/deck/deck.user-column.vue:
+  posts: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+  images: "画像"
+  activity: "アクティビティ"
+  timeline: "タイムライン"
   pinned-notes: "ピン留めされた投稿"
   push-to-a-list: "リストに追加"
 desktop/views/pages/stats/stats.vue:
@@ -1043,6 +1055,9 @@ desktop/views/pages/user/user.profile.vue:
   mute: "Wycisz"
   muted: "Wyciszyłeś"
   unmute: "Cofnij wyciszenie"
+  block: "ブロックする"
+  unblock: "ブロック解除"
+  block-confirm: "このユーザーをブロックしますか？"
   push-to-a-list: "Dodaj do listy"
   list-pushed: "Dodałeś(-aś) {user} do {list}."
 desktop/views/pages/user/user.header.vue:
@@ -1083,7 +1098,6 @@ desktop/views/widgets/users.vue:
   refresh: "Pokaż innych"
   no-one: "Pusto"
 mobile/views/components/drive.vue:
-  drive: "Dysk"
   used: "użyto"
   folder-count: "Katalog(i)"
   count-separator: ", "
@@ -1187,7 +1201,6 @@ mobile/views/components/ui.nav.vue:
   messaging: "Wiadomości"
   follow-requests: "Prośby o śledzenie"
   search: "Szukaj"
-  drive: "Dysk"
   favorites: "Ulubione"
   user-lists: "Listy"
   widgets: "Widżety"
@@ -1210,7 +1223,6 @@ mobile/views/pages/user-lists.vue:
   title: "Listy"
   enter-list-name: "Wprowadź nazwę listy"
 mobile/views/pages/drive.vue:
-  drive: "Dysk"
   more: "Załaduj więcej"
 mobile/views/pages/signup.vue:
   lets-start: "Rozpocznijmy! 📦"
@@ -1320,6 +1332,10 @@ mobile/views/pages/user.vue:
   timeline: "Oś czasu"
   media: "Multimedia"
   is-suspended: "To konto zostało zablokowane"
+  mute: "ミュート"
+  unmute: "ミュート解除"
+  block: "ブロック"
+  unblock: "ブロック解除"
 mobile/views/pages/user/home.vue:
   recent-notes: "Ostatnie wpisy"
   images: "Zdjęcia"

locales/pt-PT.yml

@@ -62,6 +62,7 @@ common:
     years_ago: "{} ano(s) atrás"
   month-and-day: "{day}/{month}"
   trash: "Lixo"
+  drive: "ドライブ"
   weekday-short:
     sunday: "Dom"
     monday: "Seg"
@@ -541,11 +542,14 @@ desktop/views/components/charts.vue:
   title: "チャート"
   per-day: "1日ごと"
   per-hour: "1時間ごと"
+  federation: "フェデレーション"
   notes: "投稿"
   users: "ユーザー"
   drive: "ドライブ"
   network: "ネットワーク"
   charts:
+    federation-instances: "インスタンスの増減"
+    federation-instances-total: "インスタンスの積算"
     notes: "投稿の増減 (統合)"
     local-notes: "投稿の増減 (ローカル)"
     remote-notes: "投稿の増減 (リモート)"
@@ -575,7 +579,6 @@ desktop/views/components/crop-window.vue:
   ok: "決定"
 desktop/views/components/drive-window.vue:
   used: "使用中"
-  drive: "ドライブ"
 desktop/views/components/drive.file.vue:
   avatar: "アイコン"
   banner: "バナー"
@@ -605,8 +608,6 @@ desktop/views/components/drive.folder.vue:
     rename: "名前を変更"
     rename-folder: "フォルダ名の変更"
     input-new-folder-name: "新しいフォルダ名を入力してください"
-desktop/views/components/drive.nav-folder.vue:
-  drive: "ドライブ"
 desktop/views/components/drive.vue:
   search: "検索"
   load-more: "もっと読み込む"
@@ -741,7 +742,6 @@ desktop/views/components/settings.vue:
   notification: "通知"
   apps: "アプリ"
   mute: "ミュート"
-  drive: "ドライブ"
   security: "セキュリティ"
   signin: "サインイン履歴"
   password: "パスワード"
@@ -847,18 +847,26 @@ desktop/views/components/settings.2fa.vue:
   success: "設定が完了しました！"
   failed: "設定に失敗しました。トークンに誤りがないかご確認ください。"
   info: "次回サインインからは、同様にパスワードに加えてデバイスに表示されているトークンを入力します。"
-desktop/views/components/settings.api.vue:
+common/views/components/api-settings.vue:
   intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
   caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
   regeneration-of-token: "万が一このトークンが漏れたりその可能性がある場合はトークンを再生成できます。"
   regenerate-token: "トークンを再生成"
   token: "Token:"
   enter-password: "パスワードを入力してください"
+  console:
+    title: 'APIコンソール'
+    endpoint: 'エンドポイント'
+    parameter: 'パラメータ'
+    send: '送信'
+    sending: '応答待ち'
+    response: '結果'
 desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
-desktop/views/components/settings.drive.vue:
-  max: "中"
+common/views/components/drive-settings.vue:
+  max: "容量"
   in-use: "使用中"
+  stats: "統計"
 desktop/views/components/settings.mute.vue:
   no-users: "ミュートしているユーザーはいません"
 desktop/views/components/settings.password.vue:
@@ -892,7 +900,6 @@ desktop/views/components/ui.header.vue:
   adjective: "さん"
 desktop/views/components/ui.header.account.vue:
   profile: "プロフィール"
-  drive: "ドライブ"
   favorites: "お気に入り"
   lists: "リスト"
   follow-requests: "フォロー申請"
@@ -936,7 +943,6 @@ desktop/views/components/window.vue:
   close: "閉じる"
 desktop/views/pages/admin/admin.vue:
   dashboard: "ダッシュボード"
-  drive: "ドライブ"
   users: "Usuários"
   update: "Actualizações"
   announcements: "お知らせ"
@@ -976,6 +982,12 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-view: "メディアビュー"
   edit: "オプション"
 desktop/views/pages/deck/deck.user-column.vue:
+  posts: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+  images: "画像"
+  activity: "アクティビティ"
+  timeline: "タイムライン"
   pinned-notes: "ピン留めされた投稿"
   push-to-a-list: "リストに追加"
 desktop/views/pages/stats/stats.vue:
@@ -1043,6 +1055,9 @@ desktop/views/pages/user/user.profile.vue:
   mute: "ミュートする"
   muted: "ミュートしています"
   unmute: "ミュート解除"
+  block: "ブロックする"
+  unblock: "ブロック解除"
+  block-confirm: "このユーザーをブロックしますか？"
   push-to-a-list: "リストに追加"
   list-pushed: "{user}を{list}に追加しました。"
 desktop/views/pages/user/user.header.vue:
@@ -1083,7 +1098,6 @@ desktop/views/widgets/users.vue:
   refresh: "他を見る"
   no-one: "いません！"
 mobile/views/components/drive.vue:
-  drive: "ドライブ"
   used: "使用中"
   folder-count: "フォルダ"
   count-separator: "、"
@@ -1187,7 +1201,6 @@ mobile/views/components/ui.nav.vue:
   messaging: "メッセージ"
   follow-requests: "フォロー申請"
   search: "検索"
-  drive: "ドライブ"
   favorites: "お気に入り"
   user-lists: "リスト"
   widgets: "ウィジェット"
@@ -1210,7 +1223,6 @@ mobile/views/pages/user-lists.vue:
   title: "リスト"
   enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
-  drive: "ドライブ"
   more: "もっと見る"
 mobile/views/pages/signup.vue:
   lets-start: "📦 始めましょう"
@@ -1320,6 +1332,10 @@ mobile/views/pages/user.vue:
   timeline: "Linha do tempo"
   media: "Mídia"
   is-suspended: "Esta conta foi suspensa"
+  mute: "ミュート"
+  unmute: "ミュート解除"
+  block: "ブロック"
+  unblock: "ブロック解除"
 mobile/views/pages/user/home.vue:
   recent-notes: "Notas recentes"
   images: "Imagens"

locales/ru-RU.yml

@@ -62,6 +62,7 @@ common:
     years_ago: "{}年前"
   month-and-day: "{month}月 {day}日"
   trash: "ゴミ箱"
+  drive: "ドライブ"
   weekday-short:
     sunday: "日"
     monday: "月"
@@ -541,11 +542,14 @@ desktop/views/components/charts.vue:
   title: "チャート"
   per-day: "1日ごと"
   per-hour: "1時間ごと"
+  federation: "フェデレーション"
   notes: "投稿"
   users: "ユーザー"
   drive: "ドライブ"
   network: "ネットワーク"
   charts:
+    federation-instances: "インスタンスの増減"
+    federation-instances-total: "インスタンスの積算"
     notes: "投稿の増減 (統合)"
     local-notes: "投稿の増減 (ローカル)"
     remote-notes: "投稿の増減 (リモート)"
@@ -575,7 +579,6 @@ desktop/views/components/crop-window.vue:
   ok: "決定"
 desktop/views/components/drive-window.vue:
   used: "使用中"
-  drive: "ドライブ"
 desktop/views/components/drive.file.vue:
   avatar: "アイコン"
   banner: "バナー"
@@ -605,8 +608,6 @@ desktop/views/components/drive.folder.vue:
     rename: "名前を変更"
     rename-folder: "フォルダ名の変更"
     input-new-folder-name: "新しいフォルダ名を入力してください"
-desktop/views/components/drive.nav-folder.vue:
-  drive: "ドライブ"
 desktop/views/components/drive.vue:
   search: "検索"
   load-more: "もっと読み込む"
@@ -741,7 +742,6 @@ desktop/views/components/settings.vue:
   notification: "通知"
   apps: "アプリ"
   mute: "ミュート"
-  drive: "ドライブ"
   security: "セキュリティ"
   signin: "サインイン履歴"
   password: "パスワード"
@@ -847,18 +847,26 @@ desktop/views/components/settings.2fa.vue:
   success: "設定が完了しました！"
   failed: "設定に失敗しました。トークンに誤りがないかご確認ください。"
   info: "次回サインインからは、同様にパスワードに加えてデバイスに表示されているトークンを入力します。"
-desktop/views/components/settings.api.vue:
+common/views/components/api-settings.vue:
   intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
   caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
   regeneration-of-token: "万が一このトークンが漏れたりその可能性がある場合はトークンを再生成できます。"
   regenerate-token: "トークンを再生成"
   token: "Token:"
   enter-password: "パスワードを入力してください"
+  console:
+    title: 'APIコンソール'
+    endpoint: 'エンドポイント'
+    parameter: 'パラメータ'
+    send: '送信'
+    sending: '応答待ち'
+    response: '結果'
 desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
-desktop/views/components/settings.drive.vue:
-  max: "中"
+common/views/components/drive-settings.vue:
+  max: "容量"
   in-use: "使用中"
+  stats: "統計"
 desktop/views/components/settings.mute.vue:
   no-users: "ミュートしているユーザーはいません"
 desktop/views/components/settings.password.vue:
@@ -892,7 +900,6 @@ desktop/views/components/ui.header.vue:
   adjective: "さん"
 desktop/views/components/ui.header.account.vue:
   profile: "プロフィール"
-  drive: "ドライブ"
   favorites: "お気に入り"
   lists: "リスト"
   follow-requests: "フォロー申請"
@@ -936,7 +943,6 @@ desktop/views/components/window.vue:
   close: "閉じる"
 desktop/views/pages/admin/admin.vue:
   dashboard: "ダッシュボード"
-  drive: "ドライブ"
   users: "ユーザー"
   update: "更新"
   announcements: "お知らせ"
@@ -976,6 +982,12 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-view: "メディアビュー"
   edit: "オプション"
 desktop/views/pages/deck/deck.user-column.vue:
+  posts: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+  images: "画像"
+  activity: "アクティビティ"
+  timeline: "タイムライン"
   pinned-notes: "ピン留めされた投稿"
   push-to-a-list: "リストに追加"
 desktop/views/pages/stats/stats.vue:
@@ -1043,6 +1055,9 @@ desktop/views/pages/user/user.profile.vue:
   mute: "ミュートする"
   muted: "ミュートしています"
   unmute: "ミュート解除"
+  block: "ブロックする"
+  unblock: "ブロック解除"
+  block-confirm: "このユーザーをブロックしますか？"
   push-to-a-list: "リストに追加"
   list-pushed: "{user}を{list}に追加しました。"
 desktop/views/pages/user/user.header.vue:
@@ -1083,7 +1098,6 @@ desktop/views/widgets/users.vue:
   refresh: "他を見る"
   no-one: "いません！"
 mobile/views/components/drive.vue:
-  drive: "ドライブ"
   used: "使用中"
   folder-count: "フォルダ"
   count-separator: "、"
@@ -1187,7 +1201,6 @@ mobile/views/components/ui.nav.vue:
   messaging: "メッセージ"
   follow-requests: "フォロー申請"
   search: "検索"
-  drive: "ドライブ"
   favorites: "お気に入り"
   user-lists: "リスト"
   widgets: "ウィジェット"
@@ -1210,7 +1223,6 @@ mobile/views/pages/user-lists.vue:
   title: "リスト"
   enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
-  drive: "ドライブ"
   more: "もっと見る"
 mobile/views/pages/signup.vue:
   lets-start: "📦 始めましょう"
@@ -1320,6 +1332,10 @@ mobile/views/pages/user.vue:
   timeline: "タイムライン"
   media: "メディア"
   is-suspended: "このユーザーは凍結されています。"
+  mute: "ミュート"
+  unmute: "ミュート解除"
+  block: "ブロック"
+  unblock: "ブロック解除"
 mobile/views/pages/user/home.vue:
   recent-notes: "最近の投稿"
   images: "画像"

locales/zh-CN.yml

@@ -62,6 +62,7 @@ common:
     years_ago: "{}年前"
   month-and-day: "{month}月 {day}日"
   trash: "ゴミ箱"
+  drive: "ドライブ"
   weekday-short:
     sunday: "日"
     monday: "月"
@@ -541,11 +542,14 @@ desktop/views/components/charts.vue:
   title: "チャート"
   per-day: "1日ごと"
   per-hour: "1時間ごと"
+  federation: "フェデレーション"
   notes: "投稿"
   users: "ユーザー"
   drive: "ドライブ"
   network: "ネットワーク"
   charts:
+    federation-instances: "インスタンスの増減"
+    federation-instances-total: "インスタンスの積算"
     notes: "投稿の増減 (統合)"
     local-notes: "投稿の増減 (ローカル)"
     remote-notes: "投稿の増減 (リモート)"
@@ -575,7 +579,6 @@ desktop/views/components/crop-window.vue:
   ok: "決定"
 desktop/views/components/drive-window.vue:
   used: "使用中"
-  drive: "ドライブ"
 desktop/views/components/drive.file.vue:
   avatar: "アイコン"
   banner: "バナー"
@@ -605,8 +608,6 @@ desktop/views/components/drive.folder.vue:
     rename: "名前を変更"
     rename-folder: "フォルダ名の変更"
     input-new-folder-name: "新しいフォルダ名を入力してください"
-desktop/views/components/drive.nav-folder.vue:
-  drive: "ドライブ"
 desktop/views/components/drive.vue:
   search: "検索"
   load-more: "もっと読み込む"
@@ -741,7 +742,6 @@ desktop/views/components/settings.vue:
   notification: "通知"
   apps: "アプリ"
   mute: "ミュート"
-  drive: "ドライブ"
   security: "セキュリティ"
   signin: "サインイン履歴"
   password: "パスワード"
@@ -847,18 +847,26 @@ desktop/views/components/settings.2fa.vue:
   success: "設定が完了しました！"
   failed: "設定に失敗しました。トークンに誤りがないかご確認ください。"
   info: "次回サインインからは、同様にパスワードに加えてデバイスに表示されているトークンを入力します。"
-desktop/views/components/settings.api.vue:
+common/views/components/api-settings.vue:
   intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
   caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
   regeneration-of-token: "万が一このトークンが漏れたりその可能性がある場合はトークンを再生成できます。"
   regenerate-token: "トークンを再生成"
   token: "Token:"
   enter-password: "パスワードを入力してください"
+  console:
+    title: 'APIコンソール'
+    endpoint: 'エンドポイント'
+    parameter: 'パラメータ'
+    send: '送信'
+    sending: '応答待ち'
+    response: '結果'
 desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
-desktop/views/components/settings.drive.vue:
-  max: "中"
+common/views/components/drive-settings.vue:
+  max: "容量"
   in-use: "使用中"
+  stats: "統計"
 desktop/views/components/settings.mute.vue:
   no-users: "ミュートしているユーザーはいません"
 desktop/views/components/settings.password.vue:
@@ -892,7 +900,6 @@ desktop/views/components/ui.header.vue:
   adjective: "さん"
 desktop/views/components/ui.header.account.vue:
   profile: "プロフィール"
-  drive: "ドライブ"
   favorites: "お気に入り"
   lists: "リスト"
   follow-requests: "フォロー申請"
@@ -936,7 +943,6 @@ desktop/views/components/window.vue:
   close: "閉じる"
 desktop/views/pages/admin/admin.vue:
   dashboard: "ダッシュボード"
-  drive: "ドライブ"
   users: "ユーザー"
   update: "更新"
   announcements: "お知らせ"
@@ -976,6 +982,12 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-view: "メディアビュー"
   edit: "オプション"
 desktop/views/pages/deck/deck.user-column.vue:
+  posts: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+  images: "画像"
+  activity: "アクティビティ"
+  timeline: "タイムライン"
   pinned-notes: "ピン留めされた投稿"
   push-to-a-list: "リストに追加"
 desktop/views/pages/stats/stats.vue:
@@ -1043,6 +1055,9 @@ desktop/views/pages/user/user.profile.vue:
   mute: "ミュートする"
   muted: "ミュートしています"
   unmute: "ミュート解除"
+  block: "ブロックする"
+  unblock: "ブロック解除"
+  block-confirm: "このユーザーをブロックしますか？"
   push-to-a-list: "リストに追加"
   list-pushed: "{user}を{list}に追加しました。"
 desktop/views/pages/user/user.header.vue:
@@ -1083,7 +1098,6 @@ desktop/views/widgets/users.vue:
   refresh: "他を見る"
   no-one: "いません！"
 mobile/views/components/drive.vue:
-  drive: "ドライブ"
   used: "使用中"
   folder-count: "フォルダ"
   count-separator: "、"
@@ -1187,7 +1201,6 @@ mobile/views/components/ui.nav.vue:
   messaging: "メッセージ"
   follow-requests: "フォロー申請"
   search: "検索"
-  drive: "ドライブ"
   favorites: "お気に入り"
   user-lists: "リスト"
   widgets: "ウィジェット"
@@ -1210,7 +1223,6 @@ mobile/views/pages/user-lists.vue:
   title: "リスト"
   enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
-  drive: "ドライブ"
   more: "もっと見る"
 mobile/views/pages/signup.vue:
   lets-start: "📦 始めましょう"
@@ -1320,6 +1332,10 @@ mobile/views/pages/user.vue:
   timeline: "タイムライン"
   media: "メディア"
   is-suspended: "このユーザーは凍結されています。"
+  mute: "ミュート"
+  unmute: "ミュート解除"
+  block: "ブロック"
+  unblock: "ブロック解除"
 mobile/views/pages/user/home.vue:
   recent-notes: "最近の投稿"
   images: "画像"

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "10.30.0",
-	"clientVersion": "1.0.11019",
+	"version": "10.34.0",
+	"clientVersion": "1.0.11234",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
@@ -58,7 +58,7 @@
 		"@types/koa__cors": "2.2.3",
 		"@types/minio": "7.0.0",
 		"@types/mkdirp": "0.5.2",
-		"@types/mocha": "5.2.3",
+		"@types/mocha": "5.2.5",
 		"@types/mongodb": "3.1.12",
 		"@types/ms": "0.7.30",
 		"@types/node": "10.12.0",
@@ -84,7 +84,7 @@
 		"@types/websocket": "0.0.40",
 		"@types/ws": "6.0.1",
 		"animejs": "2.2.0",
-		"apexcharts": "2.1.5",
+		"apexcharts": "2.1.6",
 		"autobind-decorator": "2.1.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
@@ -104,15 +104,13 @@
 		"deep-equal": "1.0.1",
 		"deepcopy": "0.6.3",
 		"diskusage": "0.2.5",
-		"dompurify": "1.0.5",
 		"double-ended-queue": "2.1.0-0",
 		"elasticsearch": "15.1.1",
 		"emojilib": "2.3.0",
 		"escape-regexp": "0.0.1",
-		"eslint": "5.0.1",
+		"eslint": "5.8.0",
 		"eslint-plugin-vue": "4.7.1",
 		"eventemitter3": "3.1.0",
-		"exif-js": "2.3.0",
 		"file-loader": "2.0.0",
 		"file-type": "10.1.0",
 		"fuckadblock": "3.2.1",
@@ -131,8 +129,7 @@
 		"gulp-uglify": "3.0.1",
 		"gulp-util": "3.0.8",
 		"hard-source-webpack-plugin": "0.12.0",
-		"highlight.js": "9.12.0",
-		"html-minifier": "3.5.20",
+		"html-minifier": "3.5.21",
 		"http-signature": "1.2.0",
 		"insert-text-at-cursor": "0.1.1",
 		"is-root": "2.0.0",
@@ -141,7 +138,7 @@
 		"jsdom": "12.2.0",
 		"json5": "2.1.0",
 		"json5-loader": "1.0.1",
-		"koa": "2.5.1",
+		"koa": "2.6.1",
 		"koa-bodyparser": "4.2.1",
 		"koa-compress": "3.0.0",
 		"koa-favicon": "2.0.1",
@@ -154,7 +151,6 @@
 		"koa-slow": "2.1.0",
 		"koa-views": "6.1.4",
 		"loader-utils": "1.1.0",
-		"lodash.assign": "4.2.0",
 		"mecab-async": "0.1.2",
 		"merge-options": "1.0.1",
 		"minio": "7.0.1",
@@ -205,10 +201,10 @@
 		"textarea-caret": "3.1.0",
 		"tinycolor2": "1.4.1",
 		"tmp": "0.0.33",
-		"ts-loader": "4.4.1",
+		"ts-loader": "5.2.2",
 		"ts-node": "7.0.1",
 		"tslint": "5.10.0",
-		"typescript": "2.9.2",
+		"typescript": "3.1.3",
 		"typescript-eslint-parser": "20.0.0",
 		"uglify-es": "3.3.9",
 		"url-loader": "1.1.2",
@@ -233,17 +229,10 @@
 		"vuex-persistedstate": "2.5.4",
 		"web-push": "3.3.3",
 		"webfinger.js": "2.6.6",
-		"webpack": "4.22.0",
+		"webpack": "4.23.1",
 		"webpack-cli": "3.1.2",
 		"websocket": "1.0.28",
 		"ws": "6.1.0",
 		"xev": "2.0.1"
-	},
-	"greenkeeper": {
-		"ignore": [
-			"deepcopy",
-			"cafy",
-			"@types/gulp"
-		]
 	}
 }

src/chart/federation.ts

@@ -0,0 +1,66 @@
+import autobind from 'autobind-decorator';
+import Chart, { Obj } from '.';
+import Instance from '../models/instance';
+
+/**
+ * フェデレーションに関するチャート
+ */
+type FederationLog = {
+	instance: {
+		/**
+		 * インスタンス数の合計
+		 */
+		total: number;
+
+		/**
+		 * 増加インスタンス数
+		 */
+		inc: number;
+
+		/**
+		 * 減少インスタンス数
+		 */
+		dec: number;
+	};
+};
+
+class FederationChart extends Chart<FederationLog> {
+	constructor() {
+		super('federation');
+	}
+
+	@autobind
+	protected async getTemplate(init: boolean, latest?: FederationLog): Promise<FederationLog> {
+		const [total] = init ? await Promise.all([
+			Instance.count({})
+		]) : [
+			latest ? latest.instance.total : 0
+		];
+
+		return {
+			instance: {
+				total: total,
+				inc: 0,
+				dec: 0
+			}
+		};
+	}
+
+	@autobind
+	public async update(isAdditional: boolean) {
+		const update: Obj = {};
+
+		update.total = isAdditional ? 1 : -1;
+		if (isAdditional) {
+			update.inc = 1;
+		} else {
+			update.dec = 1;
+		}
+
+		await this.inc({
+			instance: update
+		});
+	}
+}
+
+export default new FederationChart();

src/chart/hashtag.ts

@@ -1,36 +1,55 @@
 import autobind from 'autobind-decorator';
-import * as mongo from 'mongodb';
-import Chart, { Partial } from './';
+import Chart, { Obj } from './';
+import { IUser, isLocalUser } from '../models/user';
+import db from '../db/mongodb';
 
 /**
  * ハッシュタグに関するチャート
  */
 type HashtagLog = {
-	/**
-	 * 投稿された数
-	 */
-	count: number;
+	local: {
+		/**
+		 * 投稿された数
+		 */
+		count: number;
+	};
+
+	remote: HashtagLog['local'];
 };
 
 class HashtagChart extends Chart<HashtagLog> {
 	constructor() {
 		super('hashtag', true);
+
+		// 後方互換性のため
+		db.get('chart.hashtag').findOne().then(doc => {
+			if (doc != null && doc.data.local == null) {
+				db.get('chart.hashtag').drop();
+			}
+		});
 	}
 
 	@autobind
 	protected async getTemplate(init: boolean, latest?: HashtagLog): Promise<HashtagLog> {
 		return {
-			count: 0
+			local: {
+				count: 0
+			},
+			remote: {
+				count: 0
+			}
 		};
 	}
 
 	@autobind
-	public async update(hashtag: string, userId: mongo.ObjectId) {
-		const inc: Partial<HashtagLog> = {
+	public async update(hashtag: string, user: IUser) {
+		const update: Obj = {
 			count: 1
 		};
 
-		await this.incIfUnique(inc, 'users', userId.toHexString(), hashtag);
+		await this.incIfUnique({
+			[isLocalUser(user) ? 'local' : 'remote']: update
+		}, 'users', user._id.toHexString(), hashtag);
 	}
 }
 

src/chart/index.ts

@@ -20,7 +20,6 @@ type ArrayValue<T> = {
 
 type Span = 'day' | 'hour';
 
-//#region Chart Core
 type Log<T extends Obj> = {
 	_id: mongo.ObjectID;
 
@@ -87,13 +86,33 @@ export default abstract class Chart<T> {
 	}
 
 	@autobind
-	private async getCurrentLog(span: Span, group?: any): Promise<Log<T>> {
+	private getCurrentDate(): [number, number, number, number] {
 		const now = new Date();
+
 		const y = now.getFullYear();
 		const m = now.getMonth();
 		const d = now.getDate();
 		const h = now.getHours();
 
+		return [y, m, d, h];
+	}
+
+	@autobind
+	private getLatestLog(span: Span, group?: any): Promise<Log<T>> {
+		return this.collection.findOne({
+			group: group,
+			span: span
+		}, {
+			sort: {
+				date: -1
+			}
+		});
+	}
+
+	@autobind
+	private async getCurrentLog(span: Span, group?: any): Promise<Log<T>> {
+		const [y, m, d, h] = this.getCurrentDate();
+
 		const current =
 			span == 'day' ? new Date(y, m, d) :
 			span == 'hour' ? new Date(y, m, d, h) :
@@ -106,53 +125,55 @@ export default abstract class Chart<T> {
 			date: current
 		});
 
-		if (currentLog) {
+		// ログがあればそれを返して終了
+		if (currentLog != null) {
 			return currentLog;
 		}
 
+		let log: Log<T>;
+		let data: T;
+
 		// 集計期間が変わってから、初めてのチャート更新なら
 		// 最も最近のログを持ってくる
 		// * 例えば集計期間が「日」である場合で考えると、
 		// * 昨日何もチャートを更新するような出来事がなかった場合は、
 		// * ログがそもそも作られずドキュメントが存在しないということがあり得るため、
 		// * 「昨日の」と決め打ちせずに「もっとも最近の」とします
-		const latest = await this.collection.findOne({
-			group: group,
-			span: span
-		}, {
-			sort: {
-				date: -1
-			}
-		});
+		const latest = await this.getLatestLog(span, group);
 
-		if (latest) {
-			// 現在のログを初期挿入
-			const data = await this.getTemplate(false, latest.data);
-
-			const log = await this.collection.insert({
-				group: group,
-				span: span,
-				date: current,
-				data: data
-			});
-
-			return log;
+		if (latest != null) {
+			// 空ログデータを作成
+			data = await this.getTemplate(false, latest.data);
 		} else {
 			// ログが存在しなかったら
-			// * Misskeyインスタンスを建てて初めてのチャート更新時など
+			// (Misskeyインスタンスを建てて初めてのチャート更新時など
+			// または何らかの理由でチャートコレクションを抹消した場合)
 
-			// 空のログを作成
-			const data = await this.getTemplate(true, null, group);
+			// 初期ログデータを作成
+			data = await this.getTemplate(true, null, group);
+		}
 
-			const log = await this.collection.insert({
+		try {
+			// 新規ログ挿入
+			log = await this.collection.insert({
 				group: group,
 				span: span,
 				date: current,
 				data: data
 			});
-
-			return log;
+		} catch (e) {
+			// 11000 is duplicate key error
+			// 並列動作している他のチャートエンジンプロセスと処理が重なる場合がある
+			// その場合は再度最も新しいログを持ってくる
+			if (e.code === 11000) {
+				log = await this.getLatestLog(span, group);
+			} else {
+				console.error(e);
+				throw e;
+			}
 		}
+
+		return log;
 	}
 
 	@autobind
@@ -173,6 +194,7 @@ export default abstract class Chart<T> {
 				};
 			}
 
+			// ログ更新
 			this.collection.update({
 				_id: log._id
 			}, query);
@@ -200,16 +222,14 @@ export default abstract class Chart<T> {
 	public async getChart(span: Span, range: number, group?: any): Promise<ArrayValue<T>> {
 		const promisedChart: Promise<T>[] = [];
 
-		const now = new Date();
-		const y = now.getFullYear();
-		const m = now.getMonth();
-		const d = now.getDate();
-		const h = now.getHours();
+		const [y, m, d, h] = this.getCurrentDate();
 
 		const gt =
 			span == 'day' ? new Date(y, m, d - range) :
-			span == 'hour' ? new Date(y, m, d, h - range) : null;
+			span == 'hour' ? new Date(y, m, d, h - range) :
+			null;
 
+		// ログ取得
 		const logs = await this.collection.find({
 			group: group,
 			span: span,
@@ -225,6 +245,7 @@ export default abstract class Chart<T> {
 			}
 		});
 
+		// 整形
 		for (let i = (range - 1); i >= 0; i--) {
 			const current =
 				span == 'day' ? new Date(y, m, d - i) :
@@ -235,7 +256,8 @@ export default abstract class Chart<T> {
 
 			if (log) {
 				promisedChart.unshift(Promise.resolve(log.data));
-			} else { // 隙間埋め
+			} else {
+				// 隙間埋め
 				const latest = logs.find(l => l.date.getTime() < current.getTime());
 				promisedChart.unshift(this.getTemplate(false, latest ? latest.data : null));
 			}
@@ -282,4 +304,3 @@ export default abstract class Chart<T> {
 		return res;
 	}
 }
-//#endregion

src/client/app/common/views/components/api-settings.vue

@@ -0,0 +1,72 @@
+<template>
+<ui-card>
+	<div slot="title">%fa:key% API</div>
+
+	<section class="fit-top">
+		<ui-input :value="$store.state.i.token" readonly>
+			<span>%i18n:@token%</span>
+		</ui-input>
+		<p>%i18n:@intro%</p>
+		<ui-info warn>%i18n:@caution%</ui-info>
+		<p>%i18n:@regeneration-of-token%</p>
+		<ui-button @click="regenerateToken">%fa:sync-alt% %i18n:@regenerate-token%</ui-button>
+	</section>
+
+	<section>
+		<header>%fa:terminal% %i18n:@console.title%</header>
+		<ui-input v-model="endpoint">
+			<span>%i18n:@console.endpoint%</span>
+		</ui-input>
+		<ui-textarea v-model="body">
+			<span>%i18n:@console.parameter% (JSON or JSON5)</span>
+		</ui-textarea>
+		<ui-button @click="send" :disabled="sending">
+			<template v-if="sending">%i18n:@console.sending%</template>
+			<template v-else>%fa:paper-plane% %i18n:@console.send%</template>
+		</ui-button>
+		<ui-textarea v-if="res" v-model="res" readonly tall>
+			<span>%i18n:@console.response%</span>
+		</ui-textarea>
+	</section>
+</ui-card>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import * as JSON5 from 'json5';
+
+export default Vue.extend({
+	data() {
+		return {
+			endpoint: '',
+			body: '{}',
+			res: null,
+			sending: false
+		};
+	},
+
+	methods: {
+		regenerateToken() {
+			(this as any).apis.input({
+				title: '%i18n:@enter-password%',
+				type: 'password'
+			}).then(password => {
+				(this as any).api('i/regenerate_token', {
+					password: password
+				});
+			});
+		},
+
+		send() {
+			this.sending = true;
+			(this as any).api(this.endpoint, JSON5.parse(this.body)).then(res => {
+				this.sending = false;
+				this.res = JSON5.stringify(res, null, 2);
+			}, err => {
+				this.sending = false;
+				this.res = JSON5.stringify(err, null, 2);
+			});
+		}
+	}
+});
+</script>

src/client/app/common/views/components/drive-settings.vue

@@ -0,0 +1,171 @@
+<template>
+<ui-card>
+	<div slot="title">%fa:cloud% %i18n:common.drive%</div>
+
+	<section v-if="!fetching" class="juakhbxthdewydyreaphkepoxgxvfogn">
+		<div class="meter"><div :style="meterStyle"></div></div>
+		<p>%i18n:@max%: <b>{{ capacity | bytes }}</b> %i18n:@in-use%: <b>{{ usage | bytes }}</b></p>
+	</section>
+
+	<section>
+		<header>%i18n:@stats%</header>
+		<div ref="chart" style="margin-bottom: -16px; color: #000;"></div>
+	</section>
+</ui-card>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import * as tinycolor from 'tinycolor2';
+import * as ApexCharts from 'apexcharts';
+
+export default Vue.extend({
+	data() {
+		return {
+			fetching: true,
+			usage: null,
+			capacity: null
+		};
+	},
+
+	computed: {
+		meterStyle(): any {
+			return {
+				width: `${this.usage / this.capacity * 100}%`,
+				background: tinycolor({
+					h: 180 - (this.usage / this.capacity * 180),
+					s: 0.7,
+					l: 0.5
+				})
+			};
+		}
+	},
+
+	mounted() {
+		(this as any).api('drive').then(info => {
+			this.capacity = info.capacity;
+			this.usage = info.usage;
+			this.fetching = false;
+
+			this.$nextTick(() => {
+				this.renderChart();
+			});
+		});
+	},
+
+	methods: {
+		renderChart() {
+			(this as any).api('charts/user/drive', {
+				userId: this.$store.state.i.id,
+				span: 'day',
+				limit: 21
+			}).then(stats => {
+				const addition = [];
+				const deletion = [];
+
+				const now = new Date();
+				const y = now.getFullYear();
+				const m = now.getMonth();
+				const d = now.getDate();
+
+				for (let i = 0; i < 21; i++) {
+					const x = new Date(y, m, d - i);
+					addition.push([
+						x,
+						stats.incSize[i]
+					]);
+					deletion.push([
+						x,
+						-stats.decSize[i]
+					]);
+				}
+
+				const chart = new ApexCharts(this.$refs.chart, {
+					chart: {
+						type: 'bar',
+						stacked: true,
+						height: 150,
+						zoom: {
+							enabled: false
+						}
+					},
+					plotOptions: {
+						bar: {
+							columnWidth: '90%',
+							endingShape: 'rounded'
+						}
+					},
+					grid: {
+						clipMarkers: false,
+						borderColor: 'rgba(0, 0, 0, 0.1)'
+					},
+					tooltip: {
+						shared: true,
+						intersect: false
+					},
+					dataLabels: {
+						enabled: false
+					},
+					legend: {
+						show: false
+					},
+					series: [{
+						name: 'Additions',
+						data: addition
+					}, {
+						name: 'Deletions',
+						data: deletion
+					}],
+					xaxis: {
+						type: 'datetime',
+						labels: {
+							style: {
+								colors: tinycolor(getComputedStyle(document.documentElement).getPropertyValue('--text')).toRgbString()
+							}
+						},
+						axisBorder: {
+							color: 'rgba(0, 0, 0, 0.1)'
+						},
+						axisTicks: {
+							color: 'rgba(0, 0, 0, 0.1)'
+						},
+						crosshairs: {
+							width: 1,
+							opacity: 1
+						}
+					},
+					yaxis: {
+						labels: {
+							formatter: v => Vue.filter('bytes')(v, 0),
+							style: {
+								color: tinycolor(getComputedStyle(document.documentElement).getPropertyValue('--text')).toRgbString()
+							}
+						}
+					}
+				});
+
+				chart.render();
+			});
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.juakhbxthdewydyreaphkepoxgxvfogn
+	> .meter
+		$size = 12px
+
+		margin-bottom 16px
+		background rgba(0, 0, 0, 0.1)
+		border-radius ($size / 2)
+		overflow hidden
+
+		> div
+			height $size
+			border-radius ($size / 2)
+
+	> p
+		margin 0
+
+</style>

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

@@ -1,5 +1,7 @@
 import Vue from 'vue';
 
+import apiSettings from './api-settings.vue';
+import driveSettings from './drive-settings.vue';
 import profileEditor from './profile-editor.vue';
 import noteSkeleton from './note-skeleton.vue';
 import theme from './theme.vue';
@@ -43,9 +45,12 @@ import uiTextarea from './ui/textarea.vue';
 import uiSwitch from './ui/switch.vue';
 import uiRadio from './ui/radio.vue';
 import uiSelect from './ui/select.vue';
+import uiInfo from './ui/info.vue';
 import formButton from './ui/form/button.vue';
 import formRadio from './ui/form/radio.vue';
 
+Vue.component('mk-api-settings', apiSettings);
+Vue.component('mk-drive-settings', driveSettings);
 Vue.component('mk-profile-editor', profileEditor);
 Vue.component('mk-note-skeleton', noteSkeleton);
 Vue.component('mk-theme', theme);
@@ -89,5 +94,6 @@ Vue.component('ui-textarea', uiTextarea);
 Vue.component('ui-switch', uiSwitch);
 Vue.component('ui-radio', uiRadio);
 Vue.component('ui-select', uiSelect);
+Vue.component('ui-info', uiInfo);
 Vue.component('form-button', formButton);
 Vue.component('form-radio', formRadio);

src/client/app/common/views/components/ui/info.vue

@@ -0,0 +1,33 @@
+<template>
+<div class="ymxyweixqwsxauxldgpvecjepnwxbylu" :class="{ warn }">
+	<i v-if="warn">%fa:exclamation-triangle%</i>
+	<slot></slot>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+export default Vue.extend({
+	props: {
+		warn: {
+			type: Boolean,
+			required: false,
+			default: false
+		},
+	},
+});
+</script>
+
+<style lang="stylus" scoped>
+.ymxyweixqwsxauxldgpvecjepnwxbylu
+	margin 16px 0
+	padding 16px
+	font-size 90%
+
+	> i
+		margin-right 4px
+
+	&.warn
+		background var(--infoWarnBg)
+		color var(--infoWarnFg)
+</style>

src/client/app/common/views/components/ui/textarea.vue

@@ -1,17 +1,17 @@
 <template>
-<div class="ui-textarea" :class="{ focused, filled }">
+<div class="ui-textarea" :class="{ focused, filled, tall }">
 	<div class="input">
 		<span class="label" ref="label"><slot></slot></span>
 		<textarea ref="input"
-				:value="value"
-				:required="required"
-				:readonly="readonly"
-				:pattern="pattern"
-				:autocomplete="autocomplete"
-				@input="$emit('input', $event.target.value)"
-				@focus="focused = true"
-				@blur="focused = false">
-		</textarea>
+			:value="value"
+			:required="required"
+			:readonly="readonly"
+			:pattern="pattern"
+			:autocomplete="autocomplete"
+			@input="$emit('input', $event.target.value)"
+			@focus="focused = true"
+			@blur="focused = false"
+		></textarea>
 	</div>
 	<div class="text"><slot name="text"></slot></div>
 </div>
@@ -41,7 +41,12 @@ export default Vue.extend({
 		autocomplete: {
 			type: String,
 			required: false
-		}
+		},
+		tall: {
+			type: Boolean,
+			required: false,
+			default: false
+		},
 	},
 	data() {
 		return {
@@ -66,6 +71,9 @@ export default Vue.extend({
 root(fill)
 	margin 42px 0 32px 0
 
+	&:last-child
+		margin-bottom 0
+
 	> .input
 		padding 12px
 
@@ -157,6 +165,11 @@ root(fill)
 				left 0 !important
 				transform scale(0.75)
 
+	&.tall
+		> .input
+			> textarea
+				min-height 200px
+
 .ui-textarea.fill
 	root(true)
 

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

@@ -3,6 +3,10 @@
 	<header>
 		<b>%i18n:@title%:</b>
 		<select v-model="chartType">
+			<optgroup label="%i18n:@federation%">
+				<option value="federation-instances">%i18n:@charts.federation-instances%</option>
+				<option value="federation-instances-total">%i18n:@charts.federation-instances-total%</option>
+			</optgroup>
 			<optgroup label="%i18n:@users%">
 				<option value="users">%i18n:@charts.users%</option>
 				<option value="users-total">%i18n:@charts.users-total%</option>
@@ -79,6 +83,8 @@ export default Vue.extend({
 		data(): any {
 			if (this.chart == null) return null;
 			switch (this.chartType) {
+				case 'federation-instances': return this.federationInstancesChart(false);
+				case 'federation-instances-total': return this.federationInstancesChart(true);
 				case 'users': return this.usersChart(false);
 				case 'users-total': return this.usersChart(true);
 				case 'notes': return this.notesChart('combined');
@@ -109,11 +115,13 @@ export default Vue.extend({
 		this.now = new Date();
 
 		const [perHour, perDay] = await Promise.all([Promise.all([
+			(this as any).api('charts/federation', { limit: limit, span: 'hour' }),
 			(this as any).api('charts/users', { limit: limit, span: 'hour' }),
 			(this as any).api('charts/notes', { limit: limit, span: 'hour' }),
 			(this as any).api('charts/drive', { limit: limit, span: 'hour' }),
 			(this as any).api('charts/network', { limit: limit, span: 'hour' })
 		]), Promise.all([
+			(this as any).api('charts/federation', { limit: limit, span: 'day' }),
 			(this as any).api('charts/users', { limit: limit, span: 'day' }),
 			(this as any).api('charts/notes', { limit: limit, span: 'day' }),
 			(this as any).api('charts/drive', { limit: limit, span: 'day' }),
@@ -122,16 +130,18 @@ export default Vue.extend({
 
 		const chart = {
 			perHour: {
-				users: perHour[0],
-				notes: perHour[1],
-				drive: perHour[2],
-				network: perHour[3]
+				federation: perHour[0],
+				users: perHour[1],
+				notes: perHour[2],
+				drive: perHour[3],
+				network: perHour[4]
 			},
 			perDay: {
-				users: perDay[0],
-				notes: perDay[1],
-				drive: perDay[2],
-				network: perDay[3]
+				federation: perDay[0],
+				users: perDay[1],
+				notes: perDay[2],
+				drive: perDay[3],
+				network: perDay[4]
 			}
 		};
 
@@ -156,6 +166,23 @@ export default Vue.extend({
 			return arr.map((v, i) => ({ t: this.getDate(i).getTime(), y: v }));
 		},
 
+		federationInstancesChart(total: boolean): any {
+			return [{
+				datasets: [{
+					label: 'Instances',
+					fill: true,
+					backgroundColor: rgba(colors.localPlus),
+					borderColor: colors.localPlus,
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: this.format(total
+						? this.stats.federation.instance.total
+						: sum(this.stats.federation.instance.inc, negate(this.stats.federation.instance.dec)))
+				}]
+			}];
+		},
+
 		notesChart(type: string): any {
 			return [{
 				datasets: [{

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

@@ -2,7 +2,7 @@
 <mk-window ref="window" @closed="destroyDom" width="800px" height="500px" :popout-url="popout">
 	<template slot="header">
 		<p v-if="usage" :class="$style.info"><b>{{ usage.toFixed(1) }}%</b> %i18n:@used%</p>
-		<span :class="$style.title">%fa:cloud%%i18n:@drive%</span>
+		<span :class="$style.title">%fa:cloud%%i18n:common.drive%</span>
 	</template>
 	<mk-drive :class="$style.browser" multiple :init-folder="folder" ref="browser"/>
 </mk-window>

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

@@ -67,12 +67,12 @@ export default Vue.extend({
 				text: '%i18n:@contextmenu.rename%',
 				icon: '%fa:i-cursor%',
 				action: this.rename
-			}/*, null, {
+			}, null, {
 				type: 'item',
 				text: '%i18n:common.delete%',
 				icon: '%fa:R trash-alt%',
 				action: this.deleteFolder
-			}*/], {
+			}], {
 					closed: () => {
 						this.isContextmenuShowing = false;
 					}
@@ -207,7 +207,9 @@ export default Vue.extend({
 		},
 
 		deleteFolder() {
-			alert('not implemented yet');
+			(this as any).api('drive/folders/delete', {
+				folderId: this.folder.id
+			});
 		}
 	}
 });

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

@@ -8,7 +8,7 @@
 	@drop.stop="onDrop"
 >
 	<template v-if="folder == null">%fa:cloud%</template>
-	<span>{{ folder == null ? '%i18n:@drive%' : folder.name }}</span>
+	<span>{{ folder == null ? '%i18n:common.drive%' : folder.name }}</span>
 </div>
 </template>
 

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

@@ -98,7 +98,7 @@ export default Vue.extend({
 			hierarchyFolders: [],
 			selectedFiles: [],
 			uploadings: [],
-			connection: null
+			connection: null,
 
 			/**
 			 * ドロップされようとしているか
@@ -122,6 +122,7 @@ export default Vue.extend({
 		this.connection.on('fileDeleted', this.onStreamDriveFileDeleted);
 		this.connection.on('folderCreated', this.onStreamDriveFolderCreated);
 		this.connection.on('folderUpdated', this.onStreamDriveFolderUpdated);
+		this.connection.on('folderDeleted', this.onStreamDriveFolderDeleted);
 
 		if (this.initFolder) {
 			this.move(this.initFolder);
@@ -182,6 +183,10 @@ export default Vue.extend({
 			}
 		},
 
+		onStreamDriveFolderDeleted(folderId) {
+			this.removeFolder(folderId);
+		},
+
 		onChangeUploaderUploads(uploads) {
 			this.uploadings = uploads;
 		},

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

@@ -45,7 +45,7 @@
 		<span v-if="visibility === 'specified'">%fa:envelope%</span>
 		<span v-if="visibility === 'private'">%fa:lock%</span>
 	</button>
-	<p class="text-count" :class="{ over: this.trimmedLength(text) > 1000 }">{{ 1000 - this.trimmedLength(text) }}</p>
+	<p class="text-count" :class="{ over: this.trimmedLength(text) > this.maxNoteTextLength }">{{ this.maxNoteTextLength - this.trimmedLength(text) }}</p>
 	<button :class="{ posting }" class="submit" :disabled="!canPost" @click="post">
 		{{ posting ? '%i18n:@posting%' : submitText }}<mk-ellipsis v-if="posting"/>
 	</button>
@@ -107,10 +107,17 @@ export default Vue.extend({
 			visibleUsers: [],
 			autocomplete: null,
 			draghover: false,
-			recentHashtags: JSON.parse(localStorage.getItem('hashtags') || '[]')
+			recentHashtags: JSON.parse(localStorage.getItem('hashtags') || '[]'),
+			maxNoteTextLength: 1000
 		};
 	},
 
+	created() {
+		(this as any).os.getMeta().then(meta => {
+			this.maxNoteTextLength = meta.maxNoteTextLength;
+		});
+	},
+
 	computed: {
 		draftId(): string {
 			return this.renote
@@ -149,7 +156,7 @@ export default Vue.extend({
 		canPost(): boolean {
 			return !this.posting &&
 				(1 <= this.text.length || 1 <= this.files.length || this.poll || this.renote) &&
-				(length(this.text.trim()) <= 1000);
+				(length(this.text.trim()) <= this.maxNoteTextLength);
 		}
 	},
 

src/client/app/desktop/views/components/settings.2fa.vue

@@ -1,7 +1,7 @@
 <template>
 <div class="2fa">
-	<p>%i18n:@intro%<a href="%i18n:@url%" target="_blank">%i18n:@detail%</a></p>
-	<div class="ui info warn"><p>%fa:exclamation-triangle%%i18n:@caution%</p></div>
+	<p style="margin-top:0;">%i18n:@intro%<a href="%i18n:@url%" target="_blank">%i18n:@detail%</a></p>
+	<ui-info warn>%i18n:@caution%</ui-info>
 	<p v-if="!data && !$store.state.i.twoFactorEnabled"><ui-button @click="register">%i18n:@register%</ui-button></p>
 	<template v-if="$store.state.i.twoFactorEnabled">
 		<p>%i18n:@already-registered%</p>
@@ -72,9 +72,3 @@ export default Vue.extend({
 	}
 });
 </script>
-
-<style lang="stylus" scoped>
-.2fa
-	color #4a535a
-
-</style>

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

@@ -1,40 +0,0 @@
-<template>
-<div class="root api">
-	<ui-input :value="$store.state.i.token" readonly>
-		<span>%i18n:@token%</span>
-	</ui-input>
-	<p>%i18n:@intro%</p>
-	<div class="ui info warn"><p>%fa:exclamation-triangle%%i18n:@caution%</p></div>
-	<p>%i18n:@regeneration-of-token%</p>
-	<ui-button @click="regenerateToken">%i18n:@regenerate-token%</ui-button>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-
-export default Vue.extend({
-	methods: {
-		regenerateToken() {
-			(this as any).apis.input({
-				title: '%i18n:@enter-password%',
-				type: 'password'
-			}).then(password => {
-				(this as any).api('i/regenerate_token', {
-					password: password
-				});
-			});
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.root.api
-	code
-		display inline-block
-		padding 4px 6px
-		color #555
-		background #eee
-		border-radius 2px
-</style>

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

@@ -1,34 +0,0 @@
-<template>
-<div class="root">
-	<template v-if="!fetching">
-		<p><b>{{ capacity | bytes }}</b>%i18n:@max%<b>{{ usage | bytes }}</b>%i18n:@in-use%</p>
-	</template>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-export default Vue.extend({
-	data() {
-		return {
-			fetching: true,
-			usage: null,
-			capacity: null
-		};
-	},
-	mounted() {
-		(this as any).api('drive').then(info => {
-			this.capacity = info.capacity;
-			this.usage = info.usage;
-			this.fetching = false;
-		});
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.root
-	> p
-		> b
-			margin 0 8px
-</style>

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

@@ -5,7 +5,7 @@
 		<p :class="{ active: page == 'theme' }" @mousedown="page = 'theme'">%fa:palette .fw%%i18n:@theme%</p>
 		<p :class="{ active: page == 'web' }" @mousedown="page = 'web'">%fa:desktop .fw%Web</p>
 		<p :class="{ active: page == 'notification' }" @mousedown="page = 'notification'">%fa:R bell .fw%%i18n:@notification%</p>
-		<p :class="{ active: page == 'drive' }" @mousedown="page = 'drive'">%fa:cloud .fw%%i18n:@drive%</p>
+		<p :class="{ active: page == 'drive' }" @mousedown="page = 'drive'">%fa:cloud .fw%%i18n:common.drive%</p>
 		<p :class="{ active: page == 'hashtags' }" @mousedown="page = 'hashtags'">%fa:hashtag .fw%%i18n:@tags%</p>
 		<p :class="{ active: page == 'mute' }" @mousedown="page = 'mute'">%fa:ban .fw%%i18n:@mute%</p>
 		<p :class="{ active: page == 'apps' }" @mousedown="page = 'apps'">%fa:puzzle-piece .fw%%i18n:@apps%</p>
@@ -189,12 +189,9 @@
 			</section>
 		</ui-card>
 
-		<ui-card class="drive" v-show="page == 'drive'">
-			<div slot="title">%fa:cloud% %i18n:@drive%</div>
-			<section>
-				<x-drive/>
-			</section>
-		</ui-card>
+		<div class="drive" v-if="page == 'drive'">
+			<mk-drive-settings/>
+		</div>
 
 		<ui-card class="hashtags" v-show="page == 'hashtags'">
 			<div slot="title">%fa:hashtag% %i18n:@tags%</div>
@@ -238,12 +235,9 @@
 			</section>
 		</ui-card>
 
-		<ui-card class="api" v-show="page == 'api'">
-			<div slot="title">%fa:key% API</div>
-			<section class="fit-top">
-				<x-api/>
-			</section>
-		</ui-card>
+		<div class="api" v-show="page == 'api'">
+			<mk-api-settings/>
+		</div>
 
 		<ui-card class="other" v-show="page == 'other'">
 			<div slot="title">%fa:info-circle% %i18n:@about%</div>
@@ -298,10 +292,8 @@ import Vue from 'vue';
 import XMute from './settings.mute.vue';
 import XPassword from './settings.password.vue';
 import X2fa from './settings.2fa.vue';
-import XApi from './settings.api.vue';
 import XApps from './settings.apps.vue';
 import XSignins from './settings.signins.vue';
-import XDrive from './settings.drive.vue';
 import XTags from './settings.tags.vue';
 import { url, langs, version } from '../../../config';
 import checkForUpdate from '../../../common/scripts/check-for-update';
@@ -311,10 +303,8 @@ export default Vue.extend({
 		XMute,
 		XPassword,
 		X2fa,
-		XApi,
 		XApps,
 		XSignins,
-		XDrive,
 		XTags
 	},
 	props: {

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

@@ -11,7 +11,7 @@
 					<router-link :to="`/@${ $store.state.i.username }`">%fa:user%<span>%i18n:@profile%</span>%fa:angle-right%</router-link>
 				</li>
 				<li @click="drive">
-					<p>%fa:cloud%<span>%i18n:@drive%</span>%fa:angle-right%</p>
+					<p>%fa:cloud%<span>%i18n:common.drive%</span>%fa:angle-right%</p>
 				</li>
 				<li>
 					<router-link to="/i/favorites">%fa:star%<span>%i18n:@favorites%</span>%fa:angle-right%</router-link>

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

@@ -13,7 +13,7 @@
 			<li v-if="this.$store.state.i && this.$store.state.i.isAdmin"
 				@click="nav('hashtags')" :class="{ active: page == 'hashtags' }">%fa:hashtag .fw%%i18n:@hashtags%</li>
 
-			<!-- <li @click="nav('drive')" :class="{ active: page == 'drive' }">%fa:cloud .fw%%i18n:@drive%</li> -->
+			<!-- <li @click="nav('drive')" :class="{ active: page == 'drive' }">%fa:cloud .fw%%i18n:common.drive%</li> -->
 			<!-- <li @click="nav('update')" :class="{ active: page == 'update' }">%i18n:@update%</li> -->
 		</ul>
 	</nav>

src/client/app/desktop/views/pages/deck/deck.hashtag-column.vue

@@ -16,7 +16,6 @@ import Vue from 'vue';
 import XColumn from './deck.column.vue';
 import XHashtagTl from './deck.hashtag-tl.vue';
 import * as ApexCharts from 'apexcharts';
-import * as tinycolor from 'tinycolor2';
 
 export default Vue.extend({
 	components: {
@@ -45,7 +44,8 @@ export default Vue.extend({
 			span: 'hour',
 			limit: 24
 		}).then(stats => {
-			const data = [];
+			const local = [];
+			const remote = [];
 
 			const now = new Date();
 			const y = now.getFullYear();
@@ -55,31 +55,41 @@ export default Vue.extend({
 
 			for (let i = 0; i < 24; i++) {
 				const x = new Date(y, m, d, h - i);
-				data.push([x, stats.count[i]]);
+				local.push([x, stats.local.count[i]]);
+				remote.push([x, stats.remote.count[i]]);
 			}
 
-			const color = tinycolor(getComputedStyle(document.documentElement).getPropertyValue('--primary'));
-
 			const chart = new ApexCharts(this.$refs.chart, {
 				chart: {
 					type: 'area',
-					height: 60,
+					height: 70,
 					sparkline: {
 						enabled: true
 					},
 				},
+				grid: {
+					clipMarkers: false,
+					padding: {
+						top: 16,
+						right: 16,
+						bottom: 16,
+						left: 16
+					}
+				},
 				stroke: {
 					curve: 'straight',
 					width: 2
 				},
 				series: [{
-					name: 'count',
-					data: data
+					name: 'Local',
+					data: local
+				}, {
+					name: 'Remote',
+					data: remote
 				}],
 				xaxis: {
 					type: 'datetime',
-				},
-				colors: [`#${color.clone().toHex()}`]
+				}
 			});
 
 			chart.render();
@@ -93,7 +103,6 @@ export default Vue.extend({
 	background var(--deckColumnBg)
 
 	> .chart
-		padding 16px
 		margin-bottom 16px
 		background var(--face)
 

src/client/app/desktop/views/pages/deck/deck.notes.vue

@@ -159,8 +159,8 @@ export default Vue.extend({
 			}
 			//#endregion
 
-			// タブが非表示またはスクロール位置が最上部ではないならタイトルで通知
-			if (document.hidden || !this.isScrollTop()) {
+			// タブが非表示ならタイトルで通知
+			if (document.hidden) {
 				this.$store.commit('pushBehindNote', note);
 			}
 
@@ -236,7 +236,7 @@ export default Vue.extend({
 		> .date
 			display block
 			margin 0
-			line-height 32px
+			line-height 28px
 			font-size 12px
 			text-align center
 			color var(--dateDividerFg)

src/client/app/desktop/views/pages/deck/deck.notifications.vue

@@ -178,9 +178,9 @@ export default Vue.extend({
 		> .date
 			display block
 			margin 0
-			line-height 32px
+			line-height 28px
 			text-align center
-			font-size 0.8em
+			font-size 12px
 			color var(--dateDividerFg)
 			background var(--dateDividerBg)
 			border-bottom solid 1px var(--faceDivider)

src/client/app/desktop/views/pages/deck/deck.user-column.vue

@@ -24,26 +24,55 @@
 			<div class="description">
 				<misskey-flavored-markdown v-if="user.description" :text="user.description" :i="$store.state.i"/>
 			</div>
+			<div class="counts">
+				<div>
+					<b>{{ user.notesCount | number }}</b>
+					<span>%i18n:@posts%</span>
+				</div>
+				<div>
+					<b>{{ user.followingCount | number }}</b>
+					<span>%i18n:@following%</span>
+				</div>
+				<div>
+					<b>{{ user.followersCount | number }}</b>
+					<span>%i18n:@followers%</span>
+				</div>
+			</div>
 		</div>
 		<div class="pinned" v-if="user.pinnedNotes && user.pinnedNotes.length > 0">
-			<p>%fa:thumbtack% %i18n:@pinned-notes%</p>
-			<div class="notes">
+			<p class="caption" @click="toggleShowPinned">%fa:thumbtack% %i18n:@pinned-notes%</p>
+			<span class="angle" v-if="showPinned">%fa:angle-up%</span>
+			<span class="angle" v-else>%fa:angle-down%</span>
+			<div class="notes" v-show="showPinned">
 				<x-note v-for="n in user.pinnedNotes" :key="n.id" :note="n" :mini="true"/>
 			</div>
 		</div>
 		<div class="images" v-if="images.length > 0">
-			<router-link v-for="image in images"
-				:style="`background-image: url(${image.thumbnailUrl})`"
-				:key="`${image.id}:${image._note.id}`"
-				:to="image._note | notePage"
-				:title="`${image.name}\n${(new Date(image.createdAt)).toLocaleString()}`"
-			></router-link>
+			<p class="caption" @click="toggleShowImages">%fa:images R% %i18n:@images%</p>
+			<span class="angle" v-if="showImages">%fa:angle-up%</span>
+			<span class="angle" v-else>%fa:angle-down%</span>
+			<div v-show="showImages">
+				<router-link v-for="image in images"
+					:style="`background-image: url(${image.thumbnailUrl})`"
+					:key="`${image.id}:${image._note.id}`"
+					:to="image._note | notePage"
+					:title="`${image.name}\n${(new Date(image.createdAt)).toLocaleString()}`"
+				></router-link>
+			</div>
 		</div>
 		<div class="activity">
-			<div ref="chart"></div>
+			<p class="caption" @click="toggleShowActivity">%fa:chart-bar R% %i18n:@activity%</p>
+			<span class="angle" v-if="showActivity">%fa:angle-up%</span>
+			<span class="angle" v-else>%fa:angle-down%</span>
+			<div v-show="showActivity">
+				<div ref="chart"></div>
+			</div>
 		</div>
 		<div class="tl">
-			<x-notes ref="timeline" :more="existMore ? fetchMoreNotes : null"/>
+			<p class="caption">%fa:comment-alt R% %i18n:@timeline%</p>
+			<div>
+				<x-notes ref="timeline" :more="existMore ? fetchMoreNotes : null"/>
+			</div>
 		</div>
 	</div>
 </x-column>
@@ -84,7 +113,10 @@ export default Vue.extend({
 			existMore: false,
 			moreFetching: false,
 			withFiles: false,
-			images: []
+			images: [],
+			showPinned: true,
+			showImages: true,
+			showActivity: true
 		};
 	},
 
@@ -166,11 +198,26 @@ export default Vue.extend({
 					chart: {
 						type: 'bar',
 						stacked: true,
-						height: 60,
+						height: 100,
 						sparkline: {
 							enabled: true
 						},
 					},
+					plotOptions: {
+						bar: {
+							columnWidth: '90%',
+							endingShape: 'rounded'
+						}
+					},
+					grid: {
+						clipMarkers: false,
+						padding: {
+							top: 16,
+							right: 16,
+							bottom: 16,
+							left: 16
+						}
+					},
 					tooltip: {
 						shared: true,
 						intersect: false
@@ -186,7 +233,11 @@ export default Vue.extend({
 						data: renote
 					}],
 					xaxis: {
-						type: 'datetime'
+						type: 'datetime',
+						crosshairs: {
+							width: 1,
+							opacity: 1
+						}
 					}
 				});
 
@@ -263,6 +314,18 @@ export default Vue.extend({
 				compact: false,
 				items: menu
 			});
+		},
+
+		toggleShowPinned() {
+			this.showPinned = !this.showPinned;
+		},
+
+		toggleShowImages() {
+			this.showImages = !this.showImages;
+		},
+
+		toggleShowActivity() {
+			this.showActivity = !this.showActivity;
 		}
 	}
 });
@@ -330,7 +393,6 @@ export default Vue.extend({
 		color var(--text)
 		text-align center
 		background var(--face)
-		border-bottom solid 1px var(--faceDivider)
 
 		&:before
 			content ""
@@ -346,40 +408,65 @@ export default Vue.extend({
 			border-right solid 16px transparent
 			border-bottom solid 16px var(--face)
 
-	> .pinned
-		padding-bottom 16px
-		background var(--deckColumnBg)
+		> .counts
+			display grid
+			grid-template-columns 1fr 1fr 1fr
+			margin-top 8px
+			border-top solid 1px var(--faceDivider)
 
-		> p
+			> div
+				padding 8px 8px 0 8px
+				text-align center
+
+				> b
+					display block
+					font-size 110%
+
+				> span
+					display block
+					font-size 80%
+					opacity 0.7
+
+	> *
+		> p.caption
 			margin 0
 			padding 8px 16px
 			font-size 12px
 			color var(--text)
 
+			& + .angle
+				position absolute
+				top 0
+				right 8px
+				padding 6px
+				font-size 14px
+				color var(--text)
+
+	> .pinned
 		> .notes
 			background var(--face)
 
 	> .images
-		display grid
-		grid-template-columns 1fr 1fr 1fr
-		gap 8px
-		padding 16px
-		margin-bottom 16px
-		background var(--face)
+		> div
+			display grid
+			grid-template-columns 1fr 1fr 1fr
+			gap 8px
+			padding 16px
+			background var(--face)
 
-		> *
-			height 70px
-			background-position center center
-			background-size cover
-			background-clip content-box
-			border-radius 4px
+			> *
+				height 70px
+				background-position center center
+				background-size cover
+				background-clip content-box
+				border-radius 4px
 
 	> .activity
-		padding 16px
-		margin-bottom 16px
-		background var(--face)
+		> div
+			background var(--face)
 
 	> .tl
-		background var(--face)
+		> div
+			background var(--face)
 
 </style>

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

@@ -11,7 +11,11 @@
 	<div class="action-form">
 		<ui-button @click="user.isMuted ? unmute() : mute()" v-if="$store.state.i.id != user.id">
 			<span v-if="user.isMuted">%fa:eye% %i18n:@unmute%</span>
-			<span v-if="!user.isMuted">%fa:eye-slash% %i18n:@mute%</span>
+			<span v-else>%fa:eye-slash% %i18n:@mute%</span>
+		</ui-button>
+		<ui-button @click="user.isBlocking ? unblock() : block()" v-if="$store.state.i.id != user.id">
+			<span v-if="user.isBlocking">%fa:user% %i18n:@unblock%</span>
+			<span v-else>%fa:user-slash% %i18n:@block%</span>
 		</ui-button>
 		<ui-button @click="list">%fa:list% %i18n:@push-to-a-list%</ui-button>
 	</div>
@@ -66,6 +70,27 @@ export default Vue.extend({
 			});
 		},
 
+		block() {
+			if (!window.confirm('%i18n:@block-confirm%')) return;
+			(this as any).api('blocking/create', {
+				userId: this.user.id
+			}).then(() => {
+				this.user.isBlocking = true;
+			}, () => {
+				alert('error');
+			});
+		},
+
+		unblock() {
+			(this as any).api('blocking/delete', {
+				userId: this.user.id
+			}).then(() => {
+				this.user.isBlocking = false;
+			}, () => {
+				alert('error');
+			});
+		},
+
 		list() {
 			const w = (this as any).os.new(MkUserListsWindow);
 			w.$once('choosen', async list => {
@@ -114,7 +139,6 @@ export default Vue.extend({
 	> .action-form
 		padding 16px
 		text-align center
-		border-bottom solid 1px var(--faceDivider)
 
 		> *
 			width 100%

src/client/app/mobile/views/components/drive.file-detail.vue

@@ -5,7 +5,6 @@
 			:src="file.url"
 			:alt="file.name"
 			:title="file.name"
-			@load="onImageLoaded"
 			:style="style">
 		<template v-if="kind != 'image'">%fa:file%</template>
 		<footer v-if="kind == 'image' && file.properties && file.properties.width && file.properties.height">
@@ -46,14 +45,6 @@
 			<ui-button @click="del">%fa:trash-alt R% %i18n:@delete%</ui-button>
 		</div>
 	</div>
-	<div class="exif" v-show="exif">
-		<div>
-			<p>
-				%fa:camera%%i18n:@exif%
-			</p>
-			<pre ref="exif" class="json">{{ exif ? JSON.stringify(exif, null, 2) : '' }}</pre>
-		</div>
-	</div>
 	<div class="hash">
 		<div>
 			<p>
@@ -67,8 +58,6 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import * as EXIF from 'exif-js';
-import * as hljs from 'highlight.js';
 import { gcd } from '../../../../../prelude/math';
 
 export default Vue.extend({
@@ -139,15 +128,6 @@ export default Vue.extend({
 
 		showCreatedAt() {
 			alert(new Date(this.file.createdAt).toLocaleString());
-		},
-
-		onImageLoaded() {
-			const self = this;
-			EXIF.getData(this.$refs.img, function(this: any) {
-				const allMetaData = EXIF.getAllTags(this);
-				self.exif = allMetaData;
-				hljs.highlightBlock(self.$refs.exif);
-			});
 		}
 	}
 });
@@ -256,34 +236,4 @@ export default Vue.extend({
 				border-radius 2px
 				background #f5f5f5
 
-	> .exif
-		padding 14px
-		border-top solid 1px var(--faceDivider)
-
-		> div
-			max-width 500px
-			margin 0 auto
-
-			> p
-				display block
-				margin 0
-				padding 0
-				color var(--text)
-				font-size 0.9em
-
-				> [data-fa]
-					margin-right 4px
-
-			> pre
-				display block
-				width 100%
-				margin 6px 0 0 0
-				padding 8px
-				height 128px
-				overflow auto
-				font-size 0.9em
-				border solid 1px #dfdfdf
-				border-radius 2px
-				background #f5f5f5
-
 </style>

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

@@ -1,7 +1,7 @@
 <template>
 <div class="kmmwchoexgckptowjmjgfsygeltxfeqs">
 	<nav ref="nav">
-		<a @click.prevent="goRoot()" href="/i/drive">%fa:cloud%%i18n:@drive%</a>
+		<a @click.prevent="goRoot()" href="/i/drive">%fa:cloud%%i18n:common.drive%</a>
 		<template v-for="folder in hierarchyFolders">
 			<span :key="folder.id + '>'">%fa:angle-right%</span>
 			<a :key="folder.id" @click.prevent="cd(folder)" :href="`/i/drive/folder/${folder.id}`">{{ folder.name }}</a>

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

@@ -12,7 +12,6 @@ import noteCard from './note-card.vue';
 import userCard from './user-card.vue';
 import noteDetail from './note-detail.vue';
 import followButton from './follow-button.vue';
-import muteButton from './mute-button.vue';
 import friendsMaker from './friends-maker.vue';
 import notification from './notification.vue';
 import notifications from './notifications.vue';
@@ -37,7 +36,6 @@ Vue.component('mk-note-card', noteCard);
 Vue.component('mk-user-card', userCard);
 Vue.component('mk-note-detail', noteDetail);
 Vue.component('mk-follow-button', followButton);
-Vue.component('mk-mute-button', muteButton);
 Vue.component('mk-friends-maker', friendsMaker);
 Vue.component('mk-notification', notification);
 Vue.component('mk-notifications', notifications);

src/client/app/mobile/views/components/mute-button.vue

@@ -1,79 +0,0 @@
-<template>
-<button
-  class="mk-mute-button"
-  :class="{ active: user.isMuted }"
-  @click="onClick">
-  <span v-if="!user.isMuted">%fa:eye-slash% %i18n:@mute%</span>
-  <span v-else>%fa:eye% %i18n:@unmute%</span>
-</button>
-</template>
-
-<script lang="ts">
-import Vue from 'vue'
-export default Vue.extend({
-  props: {
-    user: {
-      type: Object,
-      required: true
-    }
-  },
-  methods: {
-    onClick() {
-      if (!this.user.isMuted) {
-        this.mute();
-      } else {
-        this.unmute();
-      }
-    },
-    mute() {
-      (this as any).api('mute/create', { userId: this.user.id})
-        .then(() => { this.user.isMuted = true })
-        .catch(() => { alert('error')})
-    },
-    unmute() {
-      (this as any).api('mute/delete', { userId: this.user.id })
-        .then(() => { this.user.isMuted = false })
-        .catch(() => { alert('error') })
-    }
-  },
-})
-</script>
-
-
-<style lang="stylus" scoped>
-
-
-.mk-mute-button
-  display block
-  user-select none
-  cursor pointer
-  padding 0 16px
-  margin 0
-  min-width 100px
-  line-height 36px
-  font-size 14px
-  font-weight bold
-  color var(--primary)
-  background transparent
-  outline none
-  border solid 1px var(--primary)
-  border-radius 36px
-
-  &:hover
-    background var(--primaryAlpha01)
-
-  &:active
-    background var(--primaryAlpha02)
-
-  &.active
-    color var(--primaryForeground)
-    background var(--primary)
-
-    &:hover
-      background var(--primaryLighten10)
-      border-color var(--primaryLighten10)
-    &:active
-      background var(--primaryDarken10)
-      border-color var(--primaryDarken10)
-
-</style>

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

@@ -4,7 +4,7 @@
 		<header>
 			<button class="cancel" @click="cancel">%fa:times%</button>
 			<div>
-				<span class="text-count" :class="{ over: trimmedLength(text) > 1000 }">{{ 1000 - trimmedLength(text) }}</span>
+				<span class="text-count" :class="{ over: trimmedLength(text) > this.maxNoteTextLength }">{{ this.maxNoteTextLength - trimmedLength(text) }}</span>
 				<span class="geo" v-if="geo">%fa:map-marker-alt%</span>
 				<button class="submit" :disabled="!canPost" @click="post">{{ submitText }}</button>
 			</div>
@@ -102,10 +102,17 @@ export default Vue.extend({
 			visibleUsers: [],
 			useCw: false,
 			cw: null,
-			recentHashtags: JSON.parse(localStorage.getItem('hashtags') || '[]')
+			recentHashtags: JSON.parse(localStorage.getItem('hashtags') || '[]'),
+			maxNoteTextLength: 1000
 		};
 	},
 
+	created() {
+		(this as any).os.getMeta().then(meta => {
+			this.maxNoteTextLength = meta.maxNoteTextLength;
+		});
+	},
+
 	computed: {
 		draftId(): string {
 			return this.renote
@@ -144,7 +151,7 @@ export default Vue.extend({
 		canPost(): boolean {
 			return !this.posting &&
 				(1 <= this.text.length || 1 <= this.files.length || this.poll || this.renote) &&
-				(this.text.trim().length <= 1000);
+				(this.text.trim().length <= this.maxNoteTextLength);
 		}
 	},
 

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

@@ -25,7 +25,7 @@
 					<li><router-link to="/i/widgets" :data-active="$route.name == 'widgets'">%fa:R calendar-alt%%i18n:@widgets%%fa:angle-right%</router-link></li>
 					<li><router-link to="/i/favorites" :data-active="$route.name == 'favorites'">%fa:star%%i18n:@favorites%%fa:angle-right%</router-link></li>
 					<li><router-link to="/i/lists" :data-active="$route.name == 'user-lists'">%fa:list%%i18n:@user-lists%%fa:angle-right%</router-link></li>
-					<li><router-link to="/i/drive" :data-active="$route.name == 'drive'">%fa:cloud%%i18n:@drive%%fa:angle-right%</router-link></li>
+					<li><router-link to="/i/drive" :data-active="$route.name == 'drive'">%fa:cloud%%i18n:common.drive%%fa:angle-right%</router-link></li>
 				</ul>
 				<ul>
 					<li><a @click="search">%fa:search%%i18n:@search%%fa:angle-right%</a></li>

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

@@ -3,7 +3,7 @@
 	<span slot="header">
 		<template v-if="folder"><span style="margin-right:4px;">%fa:R folder-open%</span>{{ folder.name }}</template>
 		<template v-if="file"><mk-file-type-icon data-icon :type="file.type" style="margin-right:4px;"/>{{ file.name }}</template>
-		<template v-if="!folder && !file"><span style="margin-right:4px;">%fa:cloud%</span>%i18n:@drive%</template>
+		<template v-if="!folder && !file"><span style="margin-right:4px;">%fa:cloud%</span>%i18n:common.drive%</template>
 	</span>
 	<template slot="func"><button @click="fn">%fa:ellipsis-h%</button></template>
 	<mk-drive

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

@@ -26,6 +26,9 @@
 					<ui-switch v-model="iLikeSushi">%i18n:common.i-like-sushi%</ui-switch>
 					<ui-switch v-model="disableAnimatedMfm">%i18n:common.disable-animated-mfm%</ui-switch>
 					<ui-switch v-model="alwaysShowNsfw">%i18n:common.always-show-nsfw% (%i18n:common.this-setting-is-this-device-only%)</ui-switch>
+				</section>
+
+				<section>
 					<ui-switch v-model="games_reversi_showBoardLabels">%i18n:common.show-reversi-board-labels%</ui-switch>
 					<ui-switch v-model="games_reversi_useContrastStones">%i18n:common.use-contrast-reversi-stones%</ui-switch>
 				</section>
@@ -80,6 +83,8 @@
 				</section>
 			</ui-card>
 
+			<mk-drive-settings/>
+
 			<ui-card>
 				<div slot="title">%fa:volume-up% %i18n:@sound%</div>
 
@@ -118,6 +123,8 @@
 				</section>
 			</ui-card>
 
+			<mk-api-settings />
+
 			<ui-card>
 				<div slot="title">%fa:sync-alt% %i18n:@update%</div>
 

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

@@ -11,7 +11,7 @@
 					<a class="avatar">
 						<img :src="user.avatarUrl" alt="avatar"/>
 					</a>
-					<mk-mute-button v-if="$store.getters.isSignedIn && $store.state.i.id != user.id" :user="user"/>
+					<button class="menu" ref="menu" @click="menu">%fa:ellipsis-h%</button>
 					<mk-follow-button v-if="$store.getters.isSignedIn && $store.state.i.id != user.id" :user="user"/>
 				</div>
 				<div class="title">
@@ -67,6 +67,7 @@ import Vue from 'vue';
 import * as age from 's-age';
 import parseAcct from '../../../../../misc/acct/parse';
 import Progress from '../../../common/scripts/loading';
+import Menu from '../../../common/views/components/menu.vue';
 import XHome from './user/home.vue';
 
 export default Vue.extend({
@@ -109,7 +110,61 @@ export default Vue.extend({
 				Progress.done();
 				document.title = `${Vue.filter('userName')(this.user)} | ${(this as any).os.instanceName}`;
 			});
-		}
+		},
+
+		menu() {
+			let menu = [{
+				icon: this.user.isMuted ? '%fa:eye%' : '%fa:eye-slash%',
+				text: this.user.isMuted ? '%i18n:@unmute%' : '%i18n:@mute%',
+				action: () => {
+					if (this.user.isMuted) {
+						(this as any).api('mute/delete', {
+							userId: this.user.id
+						}).then(() => {
+							this.user.isMuted = false;
+						}, () => {
+							alert('error');
+						});
+					} else {
+						(this as any).api('mute/create', {
+							userId: this.user.id
+						}).then(() => {
+							this.user.isMuted = true;
+						}, () => {
+							alert('error');
+						});
+					}
+				}
+			}, {
+				icon: this.user.isBlocking ? '%fa:user%' : '%fa:user-slash%',
+				text: this.user.isBlocking ? '%i18n:@unblock%' : '%i18n:@block%',
+				action: () => {
+					if (this.user.isBlocking) {
+						(this as any).api('blocking/delete', {
+							userId: this.user.id
+						}).then(() => {
+							this.user.isBlocking = false;
+						}, () => {
+							alert('error');
+						});
+					} else {
+						(this as any).api('blocking/create', {
+							userId: this.user.id
+						}).then(() => {
+							this.user.isBlocking = true;
+						}, () => {
+							alert('error');
+						});
+					}
+				}
+			}];
+
+			this.os.new(Menu, {
+				source: this.$refs.menu,
+				compact: true,
+				items: menu
+			});
+		},
 	}
 });
 </script>
@@ -156,14 +211,10 @@ main
 			max-width 600px
 
 			> .top
-				&:after
-					content ''
-					display block
-					clear both
+				display flex
 
 				> .avatar
 					display block
-					float left
 					width 25%
 					height 40px
 
@@ -183,11 +234,15 @@ main
 							border 4px solid $bg
 							border-radius 12px
 
-				> .mk-mute-button
-					float right
+				> .menu
+					margin 0 0 0 auto
+					padding 8px
+					margin-right 8px
+					font-size 18px
+					color var(--text)
 
 				> .mk-follow-button
-					float right
+					margin 0
 
 			> .title
 				margin 8px 0

src/client/theme/dark.json5

@@ -34,7 +34,7 @@
 		faceClearButtonHover: 'rgba(0, 0, 0, 0.1)',
 		faceClearButtonActive: 'rgba(0, 0, 0, 0.2)',
 		popupBg: ':lighten<5<$secondary',
-		popupFg: '#d6dce2',
+		popupFg: '$text',
 
 		subNoteBg: 'rgba(0, 0, 0, 0.18)',
 		subNoteText: ':alpha<0.7<$text',
@@ -131,6 +131,9 @@
 		remoteInfoBg: '#42321c',
 		remoteInfoFg: '#ffbd3e',
 
+		infoWarnBg: '#42321c',
+		infoWarnFg: '#ffbd3e',
+
 		messagingRoomBg: '@bg',
 		messagingRoomInfo: '#fff',
 		messagingRoomDateDividerLine: 'rgba(255, 255, 255, 0.1)',

src/client/theme/light.json5

@@ -34,7 +34,7 @@
 		faceClearButtonHover: 'rgba(0, 0, 0, 0.025)',
 		faceClearButtonActive: 'rgba(0, 0, 0, 0.05)',
 		popupBg: ':lighten<5<$secondary',
-		popupFg: '#586069',
+		popupFg: '$text',
 
 		subNoteBg: 'rgba(0, 0, 0, 0.01)',
 		subNoteText: ':alpha<0.7<$text',
@@ -131,6 +131,9 @@
 		remoteInfoBg: '#fff0db',
 		remoteInfoFg: '#573c08',
 
+		infoWarnBg: '#fff0db',
+		infoWarnFg: '#573c08',
+
 		messagingRoomBg: '#fff',
 		messagingRoomInfo: '#000',
 		messagingRoomDateDividerLine: 'rgba(0, 0, 0, 0.1)',

src/config/load.ts

@@ -49,6 +49,8 @@ export default function load() {
 	if (config.localDriveCapacityMb == null) config.localDriveCapacityMb = 256;
 	if (config.remoteDriveCapacityMb == null) config.remoteDriveCapacityMb = 8;
 
+	if (config.maxNoteTextLength == null) config.maxNoteTextLength = 1000;
+
 	if (config.name == null) config.name = 'Misskey';
 
 	return Object.assign(config, mixin);

src/config/types.ts

@@ -103,6 +103,8 @@ export type Source = {
 		engine: string;
 		timeout: number;
 	};
+
+	maxNoteTextLength?: number;
 };
 
 /**

src/docs/stream.ja-JP.md

@@ -8,7 +8,7 @@
 
 以下のURLに、`i`というパラメータ名で認証情報を含めて、websocket接続してください。例:
 ```
-%URL%/streaming?i=xxxxxxxxxxxxxxx
+%WS_URL%/streaming?i=xxxxxxxxxxxxxxx
 ```
 
 認証情報は、自分のAPIキーや、アプリケーションからストリームに接続する際はユーザーのアクセストークンのことを指します。
@@ -22,7 +22,7 @@
 認証情報は省略することもできますが、その場合非ログインでの利用ということになり、受信できる情報や可能な操作は限られます。例:
 
 ```
-%URL%/streaming
+%WS_URL%/streaming
 ```
 
 ---

src/mfm/parse/elements/quote.ts

@@ -17,7 +17,8 @@ export default function(text: string, index: number) {
 	const quote = match[1]
 		.split('\n')
 		.map(line => line.replace(/^>+/g, '').trim())
-		.join('\n');
+		.join('\n')
+		.trim();
 
 	return {
 		type: 'quote',

src/models/access-token.ts

@@ -1,6 +1,5 @@
 import * as mongo from 'mongodb';
 import db from '../db/mongodb';
-import isObjectId from '../misc/is-objectid';
 
 const AccessToken = db.get<IAccessToken>('accessTokens');
 AccessToken.createIndex('token');
@@ -15,30 +14,3 @@ export type IAccessToken = {
 	token: string;
 	hash: string;
 };
-
-/**
- * AccessTokenを物理削除します
- */
-export async function deleteAccessToken(accessToken: string | mongo.ObjectID | IAccessToken) {
-	let a: IAccessToken;
-
-	// Populate
-	if (isObjectId(accessToken)) {
-		a = await AccessToken.findOne({
-			_id: accessToken
-		});
-	} else if (typeof accessToken === 'string') {
-		a = await AccessToken.findOne({
-			_id: new mongo.ObjectID(accessToken)
-		});
-	} else {
-		a = accessToken as IAccessToken;
-	}
-
-	if (a == null) return;
-
-	// このAccessTokenを削除
-	await AccessToken.remove({
-		_id: a._id
-	});
-}

src/models/blocking.ts

@@ -0,0 +1,13 @@
+import * as mongo from 'mongodb';
+import db from '../db/mongodb';
+
+const Blocking = db.get<IBlocking>('blocking');
+Blocking.createIndex(['blockerId', 'blockeeId'], { unique: true });
+export default Blocking;
+
+export type IBlocking = {
+	_id: mongo.ObjectID;
+	createdAt: Date;
+	blockeeId: mongo.ObjectID;
+	blockerId: mongo.ObjectID;
+};

src/models/drive-file-thumbnail.ts

@@ -1,6 +1,5 @@
 import * as mongo from 'mongodb';
 import monkDb, { nativeDbConn } from '../db/mongodb';
-import isObjectId from '../misc/is-objectid';
 
 const DriveFileThumbnail = monkDb.get<IDriveFileThumbnail>('driveFileThumbnails.files');
 DriveFileThumbnail.createIndex('metadata.originalId', { sparse: true, unique: true });
@@ -28,35 +27,3 @@ export type IDriveFileThumbnail = {
 	contentType: string;
 	metadata: IMetadata;
 };
-
-/**
- * DriveFileThumbnailを物理削除します
- */
-export async function deleteDriveFileThumbnail(driveFile: string | mongo.ObjectID | IDriveFileThumbnail) {
-	let d: IDriveFileThumbnail;
-
-	// Populate
-	if (isObjectId(driveFile)) {
-		d = await DriveFileThumbnail.findOne({
-			_id: driveFile
-		});
-	} else if (typeof driveFile === 'string') {
-		d = await DriveFileThumbnail.findOne({
-			_id: new mongo.ObjectID(driveFile)
-		});
-	} else {
-		d = driveFile as IDriveFileThumbnail;
-	}
-
-	if (d == null) return;
-
-	// このDriveFileThumbnailのチャンクをすべて削除
-	await DriveFileThumbnailChunk.remove({
-		files_id: d._id
-	});
-
-	// このDriveFileThumbnailを削除
-	await DriveFileThumbnail.remove({
-		_id: d._id
-	});
-}

src/models/drive-file.ts

@@ -4,10 +4,6 @@ import { pack as packFolder } from './drive-folder';
 import config from '../config';
 import monkDb, { nativeDbConn } from '../db/mongodb';
 import isObjectId from '../misc/is-objectid';
-import Note, { deleteNote } from './note';
-import MessagingMessage, { deleteMessagingMessage } from './messaging-message';
-import User from './user';
-import DriveFileThumbnail, { deleteDriveFileThumbnail } from './drive-file-thumbnail';
 
 const DriveFile = monkDb.get<IDriveFile>('driveFiles.files');
 DriveFile.createIndex('md5');
@@ -77,64 +73,6 @@ export function validateFileName(name: string): boolean {
 	);
 }
 
-/**
- * DriveFileを物理削除します
- */
-export async function deleteDriveFile(driveFile: string | mongo.ObjectID | IDriveFile) {
-	let d: IDriveFile;
-
-	// Populate
-	if (isObjectId(driveFile)) {
-		d = await DriveFile.findOne({
-			_id: driveFile
-		});
-	} else if (typeof driveFile === 'string') {
-		d = await DriveFile.findOne({
-			_id: new mongo.ObjectID(driveFile)
-		});
-	} else {
-		d = driveFile as IDriveFile;
-	}
-
-	if (d == null) return;
-
-	// このDriveFileを添付しているNoteをすべて削除
-	await Promise.all((
-		await Note.find({ fileIds: d._id })
-	).map(x => deleteNote(x)));
-
-	// このDriveFileを添付しているMessagingMessageをすべて削除
-	await Promise.all((
-		await MessagingMessage.find({ fileId: d._id })
-	).map(x => deleteMessagingMessage(x)));
-
-	// このDriveFileがアバターやバナーに使われていたらそれらのプロパティをnullにする
-	const u = await User.findOne({ _id: d.metadata.userId });
-	if (u) {
-		if (u.avatarId && u.avatarId.equals(d._id)) {
-			await User.update({ _id: u._id }, { $set: { avatarId: null } });
-		}
-		if (u.bannerId && u.bannerId.equals(d._id)) {
-			await User.update({ _id: u._id }, { $set: { bannerId: null } });
-		}
-	}
-
-	// このDriveFileのDriveFileThumbnailをすべて削除
-	await Promise.all((
-		await DriveFileThumbnail.find({ 'metadata.originalId': d._id })
-	).map(x => deleteDriveFileThumbnail(x)));
-
-	// このDriveFileのチャンクをすべて削除
-	await DriveFileChunk.remove({
-		files_id: d._id
-	});
-
-	// このDriveFileを削除
-	await DriveFile.remove({
-		_id: d._id
-	});
-}
-
 export const packMany = async (
 	files: any[],
 	options?: {

src/models/drive-folder.ts

@@ -23,51 +23,6 @@ export function isValidFolderName(name: string): boolean {
 	);
 }
 
-/**
- * DriveFolderを物理削除します
- */
-export async function deleteDriveFolder(driveFolder: string | mongo.ObjectID | IDriveFolder) {
-	let d: IDriveFolder;
-
-	// Populate
-	if (isObjectId(driveFolder)) {
-		d = await DriveFolder.findOne({
-			_id: driveFolder
-		});
-	} else if (typeof driveFolder === 'string') {
-		d = await DriveFolder.findOne({
-			_id: new mongo.ObjectID(driveFolder)
-		});
-	} else {
-		d = driveFolder as IDriveFolder;
-	}
-
-	if (d == null) return;
-
-	// このDriveFolderに格納されているDriveFileがあればすべてルートに移動
-	await DriveFile.update({
-		'metadata.folderId': d._id
-	}, {
-		$set: {
-			'metadata.folderId': null
-		}
-	});
-
-	// このDriveFolderに格納されているDriveFolderがあればすべてルートに移動
-	await DriveFolder.update({
-		parentId: d._id
-	}, {
-		$set: {
-			parentId: null
-		}
-	});
-
-	// このDriveFolderを削除
-	await DriveFolder.remove({
-		_id: d._id
-	});
-}
-
 /**
  * Pack a drive folder for API response
  */

src/models/favorite.ts

@@ -5,6 +5,7 @@ import isObjectId from '../misc/is-objectid';
 import { pack as packNote } from './note';
 
 const Favorite = db.get<IFavorite>('favorites');
+Favorite.createIndex('userId');
 Favorite.createIndex(['userId', 'noteId'], { unique: true });
 export default Favorite;
 
@@ -15,33 +16,6 @@ export type IFavorite = {
 	noteId: mongo.ObjectID;
 };
 
-/**
- * Favoriteを物理削除します
- */
-export async function deleteFavorite(favorite: string | mongo.ObjectID | IFavorite) {
-	let f: IFavorite;
-
-	// Populate
-	if (isObjectId(favorite)) {
-		f = await Favorite.findOne({
-			_id: favorite
-		});
-	} else if (typeof favorite === 'string') {
-		f = await Favorite.findOne({
-			_id: new mongo.ObjectID(favorite)
-		});
-	} else {
-		f = favorite as IFavorite;
-	}
-
-	if (f == null) return;
-
-	// このFavoriteを削除
-	await Favorite.remove({
-		_id: f._id
-	});
-}
-
 export const packMany = async (
 	favorites: any[],
 	me: any

src/models/follow-request.ts

@@ -5,6 +5,8 @@ import isObjectId from '../misc/is-objectid';
 import { pack as packUser } from './user';
 
 const FollowRequest = db.get<IFollowRequest>('followRequests');
+FollowRequest.createIndex('followerId');
+FollowRequest.createIndex('followeeId');
 FollowRequest.createIndex(['followerId', 'followeeId'], { unique: true });
 export default FollowRequest;
 
@@ -28,33 +30,6 @@ export type IFollowRequest = {
 	}
 };
 
-/**
- * FollowRequestを物理削除します
- */
-export async function deleteFollowRequest(followRequest: string | mongo.ObjectID | IFollowRequest) {
-	let f: IFollowRequest;
-
-	// Populate
-	if (isObjectId(followRequest)) {
-		f = await FollowRequest.findOne({
-			_id: followRequest
-		});
-	} else if (typeof followRequest === 'string') {
-		f = await FollowRequest.findOne({
-			_id: new mongo.ObjectID(followRequest)
-		});
-	} else {
-		f = followRequest as IFollowRequest;
-	}
-
-	if (f == null) return;
-
-	// このFollowingを削除
-	await FollowRequest.remove({
-		_id: f._id
-	});
-}
-
 /**
  * Pack a request for API response
  */

src/models/following.ts

@@ -1,8 +1,9 @@
 import * as mongo from 'mongodb';
 import db from '../db/mongodb';
-import isObjectId from '../misc/is-objectid';
 
 const Following = db.get<IFollowing>('following');
+Following.createIndex('followerId');
+Following.createIndex('followeeId');
 Following.createIndex(['followerId', 'followeeId'], { unique: true });
 export default Following;
 
@@ -25,30 +26,3 @@ export type IFollowing = {
 		sharedInbox?: string;
 	}
 };
-
-/**
- * Followingを物理削除します
- */
-export async function deleteFollowing(following: string | mongo.ObjectID | IFollowing) {
-	let f: IFollowing;
-
-	// Populate
-	if (isObjectId(following)) {
-		f = await Following.findOne({
-			_id: following
-		});
-	} else if (typeof following === 'string') {
-		f = await Following.findOne({
-			_id: new mongo.ObjectID(following)
-		});
-	} else {
-		f = following as IFollowing;
-	}
-
-	if (f == null) return;
-
-	// このFollowingを削除
-	await Following.remove({
-		_id: f._id
-	});
-}

src/models/instance.ts

@@ -0,0 +1,35 @@
+import * as mongo from 'mongodb';
+import db from '../db/mongodb';
+
+const Instance = db.get<IInstance>('instances');
+Instance.createIndex('host', { unique: true });
+export default Instance;
+
+export interface IInstance {
+	_id: mongo.ObjectID;
+
+	/**
+	 * ホスト
+	 */
+	host: string;
+
+	/**
+	 * このインスタンスを捕捉した日時
+	 */
+	caughtAt: Date;
+
+	/**
+	 * このインスタンスのシステム (MastodonとかMisskeyとかPleromaとか)
+	 */
+	system: string;
+
+	/**
+	 * このインスタンスのユーザー数
+	 */
+	usersCount: number;
+
+	/**
+	 * このインスタンスから受け取った投稿数
+	 */
+	notesCount: number;
+}

src/models/messaging-history.ts

@@ -1,6 +1,5 @@
 import * as mongo from 'mongodb';
 import db from '../db/mongodb';
-import isObjectId from '../misc/is-objectid';
 
 const MessagingHistory = db.get<IMessagingHistory>('messagingHistories');
 export default MessagingHistory;
@@ -12,30 +11,3 @@ export type IMessagingHistory = {
 	partnerId: mongo.ObjectID;
 	messageId: mongo.ObjectID;
 };
-
-/**
- * MessagingHistoryを物理削除します
- */
-export async function deleteMessagingHistory(messagingHistory: string | mongo.ObjectID | IMessagingHistory) {
-	let m: IMessagingHistory;
-
-	// Populate
-	if (isObjectId(messagingHistory)) {
-		m = await MessagingHistory.findOne({
-			_id: messagingHistory
-		});
-	} else if (typeof messagingHistory === 'string') {
-		m = await MessagingHistory.findOne({
-			_id: new mongo.ObjectID(messagingHistory)
-		});
-	} else {
-		m = messagingHistory as IMessagingHistory;
-	}
-
-	if (m == null) return;
-
-	// このMessagingHistoryを削除
-	await MessagingHistory.remove({
-		_id: m._id
-	});
-}

src/models/messaging-message.ts

@@ -4,7 +4,6 @@ import { pack as packUser } from './user';
 import { pack as packFile } from './drive-file';
 import db from '../db/mongodb';
 import isObjectId from '../misc/is-objectid';
-import MessagingHistory, { deleteMessagingHistory } from './messaging-history';
 import { length } from 'stringz';
 
 const MessagingMessage = db.get<IMessagingMessage>('messagingMessages');
@@ -24,38 +23,6 @@ export function isValidText(text: string): boolean {
 	return length(text.trim()) <= 1000 && text.trim() != '';
 }
 
-/**
- * MessagingMessageを物理削除します
- */
-export async function deleteMessagingMessage(messagingMessage: string | mongo.ObjectID | IMessagingMessage) {
-	let m: IMessagingMessage;
-
-	// Populate
-	if (isObjectId(messagingMessage)) {
-		m = await MessagingMessage.findOne({
-			_id: messagingMessage
-		});
-	} else if (typeof messagingMessage === 'string') {
-		m = await MessagingMessage.findOne({
-			_id: new mongo.ObjectID(messagingMessage)
-		});
-	} else {
-		m = messagingMessage as IMessagingMessage;
-	}
-
-	if (m == null) return;
-
-	// このMessagingMessageを指すMessagingHistoryをすべて削除
-	await Promise.all((
-		await MessagingHistory.find({ messageId: m._id })
-	).map(x => deleteMessagingHistory(x)));
-
-	// このMessagingMessageを削除
-	await MessagingMessage.remove({
-		_id: m._id
-	});
-}
-
 /**
  * Pack a messaging message for API response
  */

src/models/mute.ts

@@ -1,6 +1,5 @@
 import * as mongo from 'mongodb';
 import db from '../db/mongodb';
-import isObjectId from '../misc/is-objectid';
 
 const Mute = db.get<IMute>('mute');
 Mute.createIndex(['muterId', 'muteeId'], { unique: true });
@@ -12,30 +11,3 @@ export interface IMute {
 	muterId: mongo.ObjectID;
 	muteeId: mongo.ObjectID;
 }
-
-/**
- * Muteを物理削除します
- */
-export async function deleteMute(mute: string | mongo.ObjectID | IMute) {
-	let m: IMute;
-
-	// Populate
-	if (isObjectId(mute)) {
-		m = await Mute.findOne({
-			_id: mute
-		});
-	} else if (typeof mute === 'string') {
-		m = await Mute.findOne({
-			_id: new mongo.ObjectID(mute)
-		});
-	} else {
-		m = mute as IMute;
-	}
-
-	if (m == null) return;
-
-	// このMuteを削除
-	await Mute.remove({
-		_id: m._id
-	});
-}

src/models/note-reaction.ts

@@ -7,6 +7,8 @@ import Reaction from './note-reaction';
 import { pack as packUser } from './user';
 
 const NoteReaction = db.get<INoteReaction>('noteReactions');
+NoteReaction.createIndex('noteId');
+NoteReaction.createIndex('userId');
 NoteReaction.createIndex(['userId', 'noteId'], { unique: true });
 export default NoteReaction;
 
@@ -31,33 +33,6 @@ export const validateReaction = $.str.or([
 	'pudding'
 ]);
 
-/**
- * NoteReactionを物理削除します
- */
-export async function deleteNoteReaction(noteReaction: string | mongo.ObjectID | INoteReaction) {
-	let n: INoteReaction;
-
-	// Populate
-	if (isObjectId(noteReaction)) {
-		n = await NoteReaction.findOne({
-			_id: noteReaction
-		});
-	} else if (typeof noteReaction === 'string') {
-		n = await NoteReaction.findOne({
-			_id: new mongo.ObjectID(noteReaction)
-		});
-	} else {
-		n = noteReaction as INoteReaction;
-	}
-
-	if (n == null) return;
-
-	// このNoteReactionを削除
-	await NoteReaction.remove({
-		_id: n._id
-	});
-}
-
 /**
  * Pack a reaction for API response
  */

src/models/note-unread.ts

@@ -2,6 +2,8 @@ import * as mongo from 'mongodb';
 import db from '../db/mongodb';
 
 const NoteUnread = db.get<INoteUnread>('noteUnreads');
+NoteUnread.createIndex('userId');
+NoteUnread.createIndex('noteId');
 NoteUnread.createIndex(['userId', 'noteId'], { unique: true });
 export default NoteUnread;
 

src/models/note-watching.ts

@@ -1,8 +1,9 @@
 import * as mongo from 'mongodb';
 import db from '../db/mongodb';
-import isObjectId from '../misc/is-objectid';
 
 const NoteWatching = db.get<INoteWatching>('noteWatching');
+NoteWatching.createIndex('userId');
+NoteWatching.createIndex('noteId');
 NoteWatching.createIndex(['userId', 'noteId'], { unique: true });
 export default NoteWatching;
 
@@ -12,30 +13,3 @@ export interface INoteWatching {
 	userId: mongo.ObjectID;
 	noteId: mongo.ObjectID;
 }
-
-/**
- * NoteWatchingを物理削除します
- */
-export async function deleteNoteWatching(noteWatching: string | mongo.ObjectID | INoteWatching) {
-	let n: INoteWatching;
-
-	// Populate
-	if (isObjectId(noteWatching)) {
-		n = await NoteWatching.findOne({
-			_id: noteWatching
-		});
-	} else if (typeof noteWatching === 'string') {
-		n = await NoteWatching.findOne({
-			_id: new mongo.ObjectID(noteWatching)
-		});
-	} else {
-		n = noteWatching as INoteWatching;
-	}
-
-	if (n == null) return;
-
-	// このNoteWatchingを削除
-	await NoteWatching.remove({
-		_id: n._id
-	});
-}

src/models/note.ts

@@ -6,14 +6,12 @@ import isObjectId from '../misc/is-objectid';
 import { length } from 'stringz';
 import { IUser, pack as packUser } from './user';
 import { pack as packApp } from './app';
-import PollVote, { deletePollVote } from './poll-vote';
-import Reaction, { deleteNoteReaction } from './note-reaction';
+import PollVote from './poll-vote';
+import Reaction from './note-reaction';
 import { packMany as packFileMany, IDriveFile } from './drive-file';
-import NoteWatching, { deleteNoteWatching } from './note-watching';
-import NoteReaction from './note-reaction';
-import Favorite, { deleteFavorite } from './favorite';
-import Notification, { deleteNotification } from './notification';
+import Favorite from './favorite';
 import Following from './following';
+import config from '../config';
 
 const Note = db.get<INote>('notes');
 Note.createIndex('uri', { sparse: true, unique: true });
@@ -21,15 +19,15 @@ Note.createIndex('userId');
 Note.createIndex('mentions');
 Note.createIndex('visibleUserIds');
 Note.createIndex('tagsLower');
+Note.createIndex('_user.host');
 Note.createIndex('_files._id');
 Note.createIndex('_files.contentType');
-Note.createIndex({
-	createdAt: -1
-});
+Note.createIndex({ createdAt: -1 });
+Note.createIndex({ score: -1 }, { sparse: true });
 export default Note;
 
 export function isValidText(text: string): boolean {
-	return length(text.trim()) <= 1000 && text.trim() != '';
+	return length(text.trim()) <= config.maxNoteTextLength && text.trim() != '';
 }
 
 export function isValidCw(text: string): boolean {
@@ -84,8 +82,14 @@ export type INote = {
 		heading: number;
 		speed: number;
 	};
+
 	uri: string;
 
+	/**
+	 * 人気の投稿度合いを表すスコア
+	 */
+	score: number;
+
 	// 非正規化
 	_reply?: {
 		userId: mongo.ObjectID;
@@ -101,72 +105,6 @@ export type INote = {
 	_files?: IDriveFile[];
 };
 
-/**
- * Noteを物理削除します
- */
-export async function deleteNote(note: string | mongo.ObjectID | INote) {
-	let n: INote;
-
-	// Populate
-	if (isObjectId(note)) {
-		n = await Note.findOne({
-			_id: note
-		});
-	} else if (typeof note === 'string') {
-		n = await Note.findOne({
-			_id: new mongo.ObjectID(note)
-		});
-	} else {
-		n = note as INote;
-	}
-
-	console.log(n == null ? `Note: delete skipped ${note}` : `Note: deleting ${n._id}`);
-
-	if (n == null) return;
-
-	// このNoteへの返信をすべて削除
-	await Promise.all((
-		await Note.find({ replyId: n._id })
-	).map(x => deleteNote(x)));
-
-	// このNoteのRenoteをすべて削除
-	await Promise.all((
-		await Note.find({ renoteId: n._id })
-	).map(x => deleteNote(x)));
-
-	// この投稿に対するNoteWatchingをすべて削除
-	await Promise.all((
-		await NoteWatching.find({ noteId: n._id })
-	).map(x => deleteNoteWatching(x)));
-
-	// この投稿に対するNoteReactionをすべて削除
-	await Promise.all((
-		await NoteReaction.find({ noteId: n._id })
-	).map(x => deleteNoteReaction(x)));
-
-	// この投稿に対するPollVoteをすべて削除
-	await Promise.all((
-		await PollVote.find({ noteId: n._id })
-	).map(x => deletePollVote(x)));
-
-	// この投稿に対するFavoriteをすべて削除
-	await Promise.all((
-		await Favorite.find({ noteId: n._id })
-	).map(x => deleteFavorite(x)));
-
-	// この投稿に対するNotificationをすべて削除
-	await Promise.all((
-		await Notification.find({ noteId: n._id })
-	).map(x => deleteNotification(x)));
-
-	// このNoteを削除
-	await Note.remove({
-		_id: n._id
-	});
-
-	console.log(`Note: deleted ${n._id}`);
-}
-
 export const hideNote = async (packedNote: any, meId: mongo.ObjectID) => {
 	let hide = false;
 
@@ -297,6 +235,7 @@ export const pack = async (
 	delete _note.prev;
 	delete _note.next;
 	delete _note.tagsLower;
+	delete _note.score;
 	delete _note._user;
 	delete _note._reply;
 	delete _note._renote;

src/models/notification.ts

@@ -51,33 +51,6 @@ export interface INotification {
 	isRead: Boolean;
 }
 
-/**
- * Notificationを物理削除します
- */
-export async function deleteNotification(notification: string | mongo.ObjectID | INotification) {
-	let n: INotification;
-
-	// Populate
-	if (isObjectId(notification)) {
-		n = await Notification.findOne({
-			_id: notification
-		});
-	} else if (typeof notification === 'string') {
-		n = await Notification.findOne({
-			_id: new mongo.ObjectID(notification)
-		});
-	} else {
-		n = notification as INotification;
-	}
-
-	if (n == null) return;
-
-	// このNotificationを削除
-	await Notification.remove({
-		_id: n._id
-	});
-}
-
 export const packMany = async (
 	notifications: any[]
 ) => {

src/models/poll-vote.ts

@@ -1,6 +1,5 @@
 import * as mongo from 'mongodb';
 import db from '../db/mongodb';
-import isObjectId from '../misc/is-objectid';
 
 const PollVote = db.get<IPollVote>('pollVotes');
 export default PollVote;
@@ -12,30 +11,3 @@ export interface IPollVote {
 	noteId: mongo.ObjectID;
 	choice: number;
 }
-
-/**
- * PollVoteを物理削除します
- */
-export async function deletePollVote(pollVote: string | mongo.ObjectID | IPollVote) {
-	let p: IPollVote;
-
-	// Populate
-	if (isObjectId(pollVote)) {
-		p = await PollVote.findOne({
-			_id: pollVote
-		});
-	} else if (typeof pollVote === 'string') {
-		p = await PollVote.findOne({
-			_id: new mongo.ObjectID(pollVote)
-		});
-	} else {
-		p = pollVote as IPollVote;
-	}
-
-	if (p == null) return;
-
-	// このPollVoteを削除
-	await PollVote.remove({
-		_id: p._id
-	});
-}

src/models/sw-subscription.ts

@@ -1,6 +1,5 @@
 import * as mongo from 'mongodb';
 import db from '../db/mongodb';
-import isObjectId from '../misc/is-objectid';
 
 const SwSubscription = db.get<ISwSubscription>('swSubscriptions');
 export default SwSubscription;
@@ -12,30 +11,3 @@ export interface ISwSubscription {
 	auth: string;
 	publickey: string;
 }
-
-/**
- * SwSubscriptionを物理削除します
- */
-export async function deleteSwSubscription(swSubscription: string | mongo.ObjectID | ISwSubscription) {
-	let s: ISwSubscription;
-
-	// Populate
-	if (isObjectId(swSubscription)) {
-		s = await SwSubscription.findOne({
-			_id: swSubscription
-		});
-	} else if (typeof swSubscription === 'string') {
-		s = await SwSubscription.findOne({
-			_id: new mongo.ObjectID(swSubscription)
-		});
-	} else {
-		s = swSubscription as ISwSubscription;
-	}
-
-	if (s == null) return;
-
-	// このSwSubscriptionを削除
-	await SwSubscription.remove({
-		_id: s._id
-	});
-}

src/models/user-list.ts

@@ -14,33 +14,6 @@ export interface IUserList {
 	userIds: mongo.ObjectID[];
 }
 
-/**
- * UserListを物理削除します
- */
-export async function deleteUserList(userList: string | mongo.ObjectID | IUserList) {
-	let u: IUserList;
-
-	// Populate
-	if (isObjectId(userList)) {
-		u = await UserList.findOne({
-			_id: userList
-		});
-	} else if (typeof userList === 'string') {
-		u = await UserList.findOne({
-			_id: new mongo.ObjectID(userList)
-		});
-	} else {
-		u = userList as IUserList;
-	}
-
-	if (u == null) return;
-
-	// このUserListを削除
-	await UserList.remove({
-		_id: u._id
-	});
-}
-
 export const pack = (
 	userList: string | mongo.ObjectID | IUserList
 ) => new Promise<any>(async (resolve, reject) => {

src/models/user.ts

@@ -1,27 +1,15 @@
 import * as mongo from 'mongodb';
 const deepcopy = require('deepcopy');
-const sequential = require('promise-sequential');
 import rap from '@prezzemolo/rap';
 import db from '../db/mongodb';
 import isObjectId from '../misc/is-objectid';
-import Note, { packMany as packNoteMany, deleteNote } from './note';
-import Following, { deleteFollowing } from './following';
-import Mute, { deleteMute } from './mute';
+import { packMany as packNoteMany } from './note';
+import Following from './following';
+import Blocking from './blocking';
+import Mute from './mute';
 import { getFriendIds } from '../server/api/common/get-friends';
 import config from '../config';
-import AccessToken, { deleteAccessToken } from './access-token';
-import NoteWatching, { deleteNoteWatching } from './note-watching';
-import Favorite, { deleteFavorite } from './favorite';
-import NoteReaction, { deleteNoteReaction } from './note-reaction';
-import MessagingMessage, { deleteMessagingMessage } from './messaging-message';
-import MessagingHistory, { deleteMessagingHistory } from './messaging-history';
-import DriveFile, { deleteDriveFile } from './drive-file';
-import DriveFolder, { deleteDriveFolder } from './drive-folder';
-import PollVote, { deletePollVote } from './poll-vote';
-import SwSubscription, { deleteSwSubscription } from './sw-subscription';
-import Notification, { deleteNotification } from './notification';
-import UserList, { deleteUserList } from './user-list';
-import FollowRequest, { deleteFollowRequest } from './follow-request';
+import FollowRequest from './follow-request';
 
 const User = db.get<IUser>('users');
 
@@ -167,151 +155,6 @@ export function isValidBirthday(birthday: string): boolean {
 }
 //#endregion
 
-/**
- * Userを物理削除します
- */
-export async function deleteUser(user: string | mongo.ObjectID | IUser) {
-	let u: IUser;
-
-	// Populate
-	if (isObjectId(user)) {
-		u = await User.findOne({
-			_id: user
-		});
-	} else if (typeof user === 'string') {
-		u = await User.findOne({
-			_id: new mongo.ObjectID(user)
-		});
-	} else {
-		u = user as IUser;
-	}
-
-	console.log(u == null ? `User: delete skipped ${user}` : `User: deleting ${u._id}`);
-
-	if (u == null) return;
-
-	// このユーザーのAccessTokenをすべて削除
-	await Promise.all((
-		await AccessToken.find({ userId: u._id })
-	).map(x => deleteAccessToken(x)));
-
-	// このユーザーのNoteをすべて削除
-	await sequential((
-		await Note.find({ userId: u._id })
-	).map(x => () => deleteNote(x)));
-
-	// このユーザーのNoteReactionをすべて削除
-	await Promise.all((
-		await NoteReaction.find({ userId: u._id })
-	).map(x => deleteNoteReaction(x)));
-
-	// このユーザーのNoteWatchingをすべて削除
-	await Promise.all((
-		await NoteWatching.find({ userId: u._id })
-	).map(x => deleteNoteWatching(x)));
-
-	// このユーザーのPollVoteをすべて削除
-	await Promise.all((
-		await PollVote.find({ userId: u._id })
-	).map(x => deletePollVote(x)));
-
-	// このユーザーのFavoriteをすべて削除
-	await Promise.all((
-		await Favorite.find({ userId: u._id })
-	).map(x => deleteFavorite(x)));
-
-	// このユーザーのMessageをすべて削除
-	await Promise.all((
-		await MessagingMessage.find({ userId: u._id })
-	).map(x => deleteMessagingMessage(x)));
-
-	// このユーザーへのMessageをすべて削除
-	await Promise.all((
-		await MessagingMessage.find({ recipientId: u._id })
-	).map(x => deleteMessagingMessage(x)));
-
-	// このユーザーの関わるMessagingHistoryをすべて削除
-	await Promise.all((
-		await MessagingHistory.find({ $or: [{ partnerId: u._id }, { userId: u._id }] })
-	).map(x => deleteMessagingHistory(x)));
-
-	// このユーザーのDriveFileをすべて削除
-	await Promise.all((
-		await DriveFile.find({ 'metadata.userId': u._id })
-	).map(x => deleteDriveFile(x)));
-
-	// このユーザーのDriveFolderをすべて削除
-	await Promise.all((
-		await DriveFolder.find({ userId: u._id })
-	).map(x => deleteDriveFolder(x)));
-
-	// このユーザーのMuteをすべて削除
-	await Promise.all((
-		await Mute.find({ muterId: u._id })
-	).map(x => deleteMute(x)));
-
-	// このユーザーへのMuteをすべて削除
-	await Promise.all((
-		await Mute.find({ muteeId: u._id })
-	).map(x => deleteMute(x)));
-
-	// このユーザーのFollowingをすべて削除
-	await Promise.all((
-		await Following.find({ followerId: u._id })
-	).map(x => deleteFollowing(x)));
-
-	// このユーザーへのFollowingをすべて削除
-	await Promise.all((
-		await Following.find({ followeeId: u._id })
-	).map(x => deleteFollowing(x)));
-
-	// このユーザーのFollowRequestをすべて削除
-	await Promise.all((
-		await FollowRequest.find({ followerId: u._id })
-	).map(x => deleteFollowRequest(x)));
-
-	// このユーザーへのFollowRequestをすべて削除
-	await Promise.all((
-		await FollowRequest.find({ followeeId: u._id })
-	).map(x => deleteFollowRequest(x)));
-
-	// このユーザーのSwSubscriptionをすべて削除
-	await Promise.all((
-		await SwSubscription.find({ userId: u._id })
-	).map(x => deleteSwSubscription(x)));
-
-	// このユーザーのNotificationをすべて削除
-	await Promise.all((
-		await Notification.find({ notifieeId: u._id })
-	).map(x => deleteNotification(x)));
-
-	// このユーザーが原因となったNotificationをすべて削除
-	await Promise.all((
-		await Notification.find({ notifierId: u._id })
-	).map(x => deleteNotification(x)));
-
-	// このユーザーのUserListをすべて削除
-	await Promise.all((
-		await UserList.find({ userId: u._id })
-	).map(x => deleteUserList(x)));
-
-	// このユーザーが入っているすべてのUserListからこのユーザーを削除
-	await Promise.all((
-		await UserList.find({ userIds: u._id })
-	).map(x =>
-		UserList.update({ _id: x._id }, {
-			$pull: { userIds: u._id }
-		})
-	));
-
-	// このユーザーを削除
-	await User.remove({
-		_id: u._id
-	});
-
-	console.log(`User: deleted ${u._id}`);
-}
-
 /**
  * Pack a user for API response
  *
@@ -426,8 +269,8 @@ export const pack = (
 		delete _user.hasUnreadNotification;
 	}
 
-	if (meId && !meId.equals(_user.id)) {
-		const [following1, following2, followReq1, followReq2, mute] = await Promise.all([
+	if (meId && !meId.equals(_user.id) && opts.detail) {
+		const [following1, following2, followReq1, followReq2, toBlocking, fromBlocked, mute] = await Promise.all([
 			Following.findOne({
 				followerId: meId,
 				followeeId: _user.id
@@ -444,6 +287,14 @@ export const pack = (
 				followerId: _user.id,
 				followeeId: meId
 			}),
+			Blocking.findOne({
+				blockerId: meId,
+				blockeeId: _user.id
+			}),
+			Blocking.findOne({
+				blockerId: _user.id,
+				blockeeId: meId
+			}),
 			Mute.findOne({
 				muterId: meId,
 				muteeId: _user.id
@@ -460,6 +311,12 @@ export const pack = (
 		// Whether the user is followed
 		_user.isFollowed = following2 !== null;
 
+		// Whether the user is blocking
+		_user.isBlocking = toBlocking !== null;
+
+		// Whether the user is blocked
+		_user.isBlocked = fromBlocked !== null;
+
 		// Whether the user is muted
 		_user.isMuted = mute !== null;
 	}

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

@@ -0,0 +1,34 @@
+import * as mongo from 'mongodb';
+import User, { IRemoteUser } from '../../../../models/user';
+import config from '../../../../config';
+import * as debug from 'debug';
+import { IBlock } from '../../type';
+import block from '../../../../services/blocking/create';
+
+const log = debug('misskey:activitypub');
+
+export default async (actor: IRemoteUser, activity: IBlock): Promise<void> => {
+	const id = typeof activity.object == 'string' ? activity.object : activity.object.id;
+
+	const uri = activity.id || activity;
+
+	log(`Block: ${uri}`);
+
+	if (!id.startsWith(config.url + '/')) {
+		return null;
+	}
+
+	const blockee = await User.findOne({
+		_id: new mongo.ObjectID(id.split('/').pop())
+	});
+
+	if (blockee === null) {
+		throw new Error('blockee not found');
+	}
+
+	if (blockee.host != null) {
+		throw new Error('ブロックしようとしているユーザーはローカルユーザーではありません');
+	}
+
+	block(actor, blockee);
+};

src/remote/activitypub/kernel/index.ts

@@ -10,6 +10,7 @@ import accept from './accept';
 import reject from './reject';
 import add from './add';
 import remove from './remove';
+import block from './block';
 
 const self = async (actor: IRemoteUser, activity: Object): Promise<void> => {
 	switch (activity.type) {
@@ -53,6 +54,10 @@ const self = async (actor: IRemoteUser, activity: Object): Promise<void> => {
 		await undo(actor, activity);
 		break;
 
+	case 'Block':
+		await block(actor, activity);
+		break;
+
 	case 'Collection':
 	case 'OrderedCollection':
 		// TODO

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

@@ -0,0 +1,34 @@
+import * as mongo from 'mongodb';
+import User, { IRemoteUser } from '../../../../models/user';
+import config from '../../../../config';
+import * as debug from 'debug';
+import { IBlock } from '../../type';
+import unblock from '../../../../services/blocking/delete';
+
+const log = debug('misskey:activitypub');
+
+export default async (actor: IRemoteUser, activity: IBlock): Promise<void> => {
+	const id = typeof activity.object == 'string' ? activity.object : activity.object.id;
+
+	const uri = activity.id || activity;
+
+	log(`UnBlock: ${uri}`);
+
+	if (!id.startsWith(config.url + '/')) {
+		return null;
+	}
+
+	const blockee = await User.findOne({
+		_id: new mongo.ObjectID(id.split('/').pop())
+	});
+
+	if (blockee === null) {
+		throw new Error('blockee not found');
+	}
+
+	if (blockee.host != null) {
+		throw new Error('ブロック解除しようとしているユーザーはローカルユーザーではありません');
+	}
+
+	unblock(actor, blockee);
+};

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

@@ -1,8 +1,9 @@
 import * as debug from 'debug';
 
 import { IRemoteUser } from '../../../../models/user';
-import { IUndo, IFollow } from '../../type';
+import { IUndo, IFollow, IBlock } from '../../type';
 import unfollow from './follow';
+import unblock from './block';
 import Resolver from '../../resolver';
 
 const log = debug('misskey:activitypub');
@@ -31,6 +32,9 @@ export default async (actor: IRemoteUser, activity: IUndo): Promise<void> => {
 		case 'Follow':
 			unfollow(actor, object as IFollow);
 			break;
+		case 'Block':
+			unblock(actor, object as IBlock);
+			break;
 	}
 
 	return null;

src/remote/activitypub/models/person.ts

@@ -13,6 +13,8 @@ import htmlToMFM from '../../../mfm/html-to-mfm';
 import usersChart from '../../../chart/users';
 import { URL } from 'url';
 import { resolveNote } from './note';
+import registerInstance from '../../../services/register-instance';
+import Instance from '../../../models/instance';
 
 const log = debug('misskey:activitypub');
 
@@ -173,6 +175,18 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<IU
 		throw e;
 	}
 
+	// Register host
+	registerInstance(host).then(i => {
+		Instance.update({ _id: i._id }, {
+			$inc: {
+				usersCount: 1
+			}
+		});
+
+		// TODO
+		//perInstanceChart.newUser();
+	});
+
 	//#region Increment users count
 	Meta.update({}, {
 		$inc: {
@@ -214,6 +228,7 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<IU
 	//#endregion
 
 	await updateFeatured(user._id).catch(err => console.log(err));
+
 	return user;
 }
 

src/remote/activitypub/renderer/block.ts

@@ -0,0 +1,8 @@
+import config from '../../../config';
+import { ILocalUser, IRemoteUser } from "../../../models/user";
+
+export default (blocker?: ILocalUser, blockee?: IRemoteUser) => ({
+	type: 'Block',
+	actor: `${config.url}/users/${blocker._id}`,
+	object: blockee.uri
+});

src/remote/activitypub/type.ts

@@ -108,6 +108,10 @@ export interface IAnnounce extends IActivity {
 	type: 'Announce';
 }
 
+export interface IBlock extends IActivity {
+	type: 'Block';
+}
+
 export type Object =
 	ICollection |
 	IOrderedCollection |
@@ -120,4 +124,5 @@ export type Object =
 	IAdd |
 	IRemove |
 	ILike |
-	IAnnounce;
+	IAnnounce |
+	IBlock;

src/remote/resolve-user.ts

@@ -8,7 +8,7 @@ export default async (username: string, _host: string, option?: any): Promise<IU
 	const usernameLower = username.toLowerCase();
 
 	if (_host == null) {
-		return await User.findOne({ usernameLower });
+		return await User.findOne({ usernameLower, host: null });
 	}
 
 	const hostAscii = toASCII(_host).toLowerCase();