Merge branch 'develop'

* wip

* Revert "wip"

This reverts commit 6212831ce3bdae5ce17f8ace9945710ba7696185.

* improve list index

* Update user-lists.vue

.circleci/config.yml

@@ -5,12 +5,6 @@ executors:
     working_directory: /tmp/workspace
     docker:
       - image: misskey/ci:latest
-      - image: circleci/mongo:latest
-  with-redis:
-    working_directory: /tmp/workspace
-    docker:
-      - image: misskey/ci:latest
-      - image: circleci/mongo:latest
       - image: circleci/redis:latest
   docker:
     working_directory: /tmp/workspace
@@ -62,22 +56,10 @@ jobs:
       executor:
         type: string
         default: "default"
-      without_redis:
-        type: boolean
-        default: false
     executor: <<parameters.executor>>
     steps:
       - attach_workspace:
           at: /tmp/workspace
-      - when:
-          condition: <<parameters.without_redis>>
-          steps:
-            - run:
-                name: Configure
-                command: |
-                  mv .config/test.yml .config/test_redis.yml
-                  touch .config/test.yml
-                  cat .config/test_redis.yml | while IFS= read line; do if [[ "$line" = '# __REDIS__' ]]; then break; else echo "$line" >> .config/test.yml; fi; done
       - run:
           name: Test
           command: |
@@ -140,32 +122,14 @@ workflows:
             branches:
               only: master
       - test:
-          name: manual-test-with-redis
+          name: manual-test
-          executor: with-redis
           requires:
             - manual-build
           filters:
             branches:
               ignore: master
       - test:
-          name: auto-test-without-redis
+          name: auto-test
-          executor: with-redis
-          requires:
-            - auto-build
-          filters:
-            branches:
-              only: master
-      - test:
-          name: manual-test-with-redis
-          without_redis: true
-          requires:
-            - manual-build
-          filters:
-            branches:
-              ignore: master
-      - test:
-          name: auto-test-without-redis
-          without_redis: true
           requires:
             - auto-build
           filters:

CHANGELOG.md

@@ -5,17 +5,110 @@ If you encounter any problems with updating, please try the following:
 1. `npm run clean` or `npm run cleanall`
 2. Retry update (Don't forget `npm i`)
 
+11.2.0 (2019/04/18)
+-------------------
+### Improvements
+* 検索で日付(日時)を入力するとタイムラインをその時点まで遡るように
+* APIコンソールでエンドポイントをサジェストするように
+* モバイル版でドライブのメニューを使いやすく
+* サイレンス時に確認を表示するように
+* ユーザーメニューでブロックなどの操作を行う時に確認するように
+
+### Fixes
+* アプリケーション連携画面でパーミッションが表示されない問題を修正
+* アンケートウィジットでもMFMを使用するように
+* フォローしてないユーザーのホーム投稿がSTLに流れてくる問題を修正
+* モバイル版でウィジェットを設定できない問題を修正
+* スプラッシュがクリックに反応するように
+
+11.1.6 (2019/04/18)
+-------------------
+### Fixes
+* 未認知ユーザーからActivityが飛んできた場合に処理できない問題を修正
+* その投稿を見たのにも関わらずメンションインジケーターが点灯し続ける問題を修正
+* ハッシュタグの判定を改善
+* サーバーのエラーハンドリングを改善
+
+11.1.5 (2019/04/17)
+-------------------
+### Fixes
+* ユーザー名に含まれているカスタム絵文字が表示されないことがある問題を修正
+* 壁紙の設定ができない問題を修正
+* デザインの調整
+
+11.1.4 (2019/04/17)
+-------------------
+### Fixes
+* タイムライン取得時に削除されたファイルを添付している投稿が含まれているとサーバーでエラーになる問題を修正
+* 管理画面のインスタンスメニューで変更前の設定が読み込まれないことがある問題を修正
+* 猫ではないのに猫のままで表示される問題を修正
+* admin/driveのアイコンがずれてる問題を修正
+* チャートで大きな数値を扱えない問題を修正
+* UIの修正
+
+11.1.3 (2019/04/16)
+-------------------
+### Fixes
+* アプリからAPIにリクエストするときにランダムなユーザーがリクエストしたことになる問題を修正
+
+11.1.2 (2019/04/15)
+-------------------
+### Fixes
+* 画像描画の依存関係を変更
+* リモートユーザーのファイルを削除するときに古い方からではなく新しい方から削除されるのを修正
+* リアクションしてないのにリアクションしたことになる問題を修正
+* APIドキュメントの修正
+
+11.1.1 (2019/04/15)
+-------------------
+### Fixes
+* Metaタグの application-name を Misskey で固定するように修正
+* トークメッセージが既読にならない問題を修正
+* デフォルトでHTLを表示するように
+
+11.1.0 (2019/04/15)
+-------------------
+### Improvements
+* アイコン未設定時にランダムな画像を表示するように
+* 管理者やモデレーターはレートリミット無効に
+
+### Fixes
+* メンションの「あなた」インジケーターが表示されない問題を修正
+* ブロックAPIでエラーが発生する問題を修正
+* プッシュ通知の購読に失敗する問題を修正
+
+11.0.3 (2019/04/15)
+-------------------
+### Fixes
+* ハッシュタグ検索APIが動作しない問題を修正
+* モデレーターなのにアカウントメニューに「管理」が表示されない問題を修正
+* プッシュ通知の購読に失敗する問題を修正
+* ユーザー取得APIでユーザーを指定しない場合エラーになる問題を修正
+
+11.0.2 (2019/04/15)
+-------------------
+### Fixes
+* アプリが作成できない問題を修正
+* 「ハイライト」が表示されない問題を修正
+* リモートの投稿に添付されている画像が小さい問題を修正
+* モバイル版でリストの名前が表示されない問題を修正
+* APIドキュメントにパーミッション一覧を追加
+
 11.0.1 (2019/04/15)
 -------------------
+### Improvements
 * 不要な依存関係を削除
 
 11.0.0 daybreak (2019/04/14)
 ----------------------------
+### Improvements
 * **データベースがMongoDBからPostgreSQLに変更されました**
 * **Redisが必須に**
 * アカウントを完全に削除できるように
 * 投稿フォームで添付ファイルの閲覧注意を確認/設定できるように
 * ミュート/ブロック時にそのユーザーの投稿のウォッチをすべて解除するように
+
+### Fixes
 * フォロー申請数が実際より1すくなくなる問題を修正
 * リストからアカウント削除したユーザーを削除できない問題を修正
 * リストTLでフォローしていないユーザーの非公開投稿が流れる問題を修正

CONTRIBUTING.md

@@ -46,10 +46,40 @@ Convert な(na) to にゃ(nya)
 Revert Nyaize
 
 ## Code style
-### Use semicolon
+### セミコロンを省略しない
-To avoid ASI Hazard
+ASI Hazardを避けるためでもある
+
+### 中括弧を省略しない
+Bad:
+``` ts
+if (foo)
+	bar;
+else
+	baz;
+```
+
+Good:
+``` ts
+if (foo) {
+	bar;
+} else {
+	baz;
+}
+```
+
+ただし**`if`が一行**の時だけは省略しても良い
+Good:
+``` ts
+if (foo) bar;
+```
+
+### `export default`を使わない
+インテリセンスと相性が悪かったりするため
+
+参考:
+* https://gfx.hatenablog.com/entry/2017/11/24/135343
+* https://basarat.gitbooks.io/typescript/docs/tips/defaultIsBad.html
 
-### Don't use `export default`
 Bad:
 ``` ts
 export default function(foo: string): string {

Dockerfile

@@ -21,12 +21,11 @@ RUN apk add --no-cache \
     pkgconfig \
     python \
     zlib-dev
-RUN npm i -g yarn
 
 COPY package.json ./
-RUN yarn install
+RUN npm i
 COPY . ./
-RUN yarn build
+RUN npm run build
 
 FROM base AS runner
 

README.md

@@ -59,7 +59,7 @@ Organize and store your files! Want to post a picture you have already uploaded?
 
 ---
 
-...and more! Experience Misskey with your own eyes at [misskey.xyz](https://misskey.xyz) or join one of the [other instances](https://joinmisskey.github.io/) that are available.
+...and more! Experience Misskey with your own eyes at [misskey.io](https://misskey.io/) or join one of the [other instances](https://joinmisskey.github.io/) that are available.
 
 Screen shots
 ----------------------------------------------------------------
@@ -103,7 +103,6 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <table><tr>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5888816/36da0f7c15954df0ab13f9abdf227f66/1.jpeg?token-time=2145916800&token-hash=at8QpJXJ8C0zINY_NmoMKv-MhXVoUK-YzTgaJPJzJYU%3D" alt="Hiroshi Seki" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12190916/fb7fa7983c14425f890369535b1506a4/3.png?token-time=2145916800&token-hash=oH_i7gJjNT7Ot6j9JiVwy7ZJIBqACVnzLqlz4YrDAZA%3D" alt="weep" width="100"></td>
-<td><img src="https://c8.patreon.com/2/200/12059069" alt="naga_rus" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13099460/43cecdbaa63a40d79bf50a96b9910b9d/1.jpe?token-time=2145916800&token-hash=bqwLTk0Wo0hUJJ8J5y7ii05bLzz-_CDA7Bo0Mp4RFU0%3D" alt="ne_moni" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12913507/f7181eacafe8469a93033d85f5969c29/4.jpe?token-time=2145916800&token-hash=zEyJqVM7u9d8Ri-65fJYSJcWF1jBH1nJ5a3taRzrTmw%3D" alt="Melilot" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5670915/ee175f0bfb6347ffa4ea101a8c097bff/1.jpg?token-time=2145916800&token-hash=mPLM9CA-riFHx-myr3bLZJuH2xBRHA9se5VbHhLIOuA%3D" alt="osapon" width="100"></td>
@@ -111,7 +110,6 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 </tr><tr>
 <td><a href="https://www.patreon.com/rane_hs">Hiroshi Seki</a></td>
 <td><a href="https://www.patreon.com/weepjp">weep</a></td>
-<td><a href="https://www.patreon.com/user?u=12059069">naga_rus</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/osapon">osapon</a></td>
@@ -142,7 +140,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 </tr></table>
 <table><tr>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/17195955/be45e5e14c3e48b2bee0456c84e19df4/4.jpe?token-time=2145916800&token-hash=UslrPVM-8TXOe8AapuNiaFYjcIJgPNcU-fKpGbfGJNI%3D" alt="Damillora" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/16900731/935a10339daa4ede8e555903a0707060/1.png?token-time=2145916800&token-hash=c1XAS1qGBPxVdCvnICxtAUmx41mVkMG87h7cIRF9YYE%3D" alt="Atsuko Tominaga" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/16900731/83884b38afc74d4cbe83c30a13b10edd/1.png?token-time=2145916800&token-hash=R5Tog8RWg0rguRoCIoir3lThokrdPvs8Utfikhc0nhY%3D" alt="Atsuko Tominaga" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4389829/9f709180ac714651a70f74a82f3ffdb9/3.png?token-time=2145916800&token-hash=FTm3WVom4dJ9NwWMU4OpCL_8Yc13WiwEbKrDPyTZTPs%3D" alt="natalie" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13034746/c711c7f58e204ecfbc2fd646bc8a4eee/1.jpe?token-time=2145916800&token-hash=EWxXhVbZYH7KB4IDT3joc8TbIg8zPO40x1r5IDn3R7c%3D" alt="Hiratake" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/18072312/98e894d960314fa7bc236a72a39488fe/1.jpe?token-time=2145916800&token-hash=qA8j97lIZNc-74AuZ0p4F3ms6sKPeKjtNt2vEuwpsyo%3D" alt="Hekovic" width="100"></td>
@@ -165,7 +163,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 </tr><tr>
 </tr></table>
 
-**Last updated:** Sun, 14 Apr 2019 08:13:12 UTC
+**Last updated:** Mon, 15 Apr 2019 12:07:08 UTC
 <!-- PATREON_END -->
 
 :four_leaf_clover: Copyright

docs/docker.en.md

@@ -9,9 +9,17 @@ This guide describes how to install and setup Misskey with Docker.
 
 *1.* Download Misskey
 ----------------------------------------------------------------
-1. `git clone -b master git://github.com/syuilo/misskey.git` Clone Misskey repository's master branch.
+1. Clone Misskey repository's master branch.
-2. `cd misskey` Move to misskey directory.
+
-3. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)` Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest) tag.
+	`git clone -b master git://github.com/syuilo/misskey.git`
+
+2. Move to misskey directory.
+
+	`cd misskey`
+
+3. Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest) tag.
+
+	`git checkout master`
 
 *2.* Configure Misskey
 ----------------------------------------------------------------
@@ -57,7 +65,13 @@ Build misskey with the following:
 
 `docker-compose build`
 
-*5.* That is it.
+*5.* Init DB
+----------------------------------------------------------------
+``` shell
+docker-compose run --rm web npm run init
+```
+
+*6.* That is it.
 ----------------------------------------------------------------
 Well done! Now you have an environment to run Misskey.
 
@@ -65,9 +79,9 @@ Well done! Now you have an environment to run Misskey.
 Just `docker-compose up -d`. GLHF!
 
 ### How to update your Misskey server to the latest version
-1. `git fetch`
+1. `git stash`
-2. `git stash`
+2. `git checkout master`
-3. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)`
+3. `git pull`
 4. `git stash pop`
 5. `docker-compose build`
 6. Check [ChangeLog](../CHANGELOG.md) for migration information

docs/docker.fr.md

@@ -10,9 +10,17 @@ Ce guide explique comment installer et configurer Misskey avec Docker.
 
 *1.* Télécharger Misskey
 ----------------------------------------------------------------
-1. `git clone -b master git://github.com/syuilo/misskey.git` Clone le dépôt de Misskey sur la branche master.
+1. Clone le dépôt de Misskey sur la branche master.
-2. `cd misskey` Naviguez dans le dossier du dépôt.
+
-3. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)` Checkout sur le tag de la [dernière version](https://github.com/syuilo/misskey/releases/latest).
+	`git clone -b master git://github.com/syuilo/misskey.git`
+
+2. Naviguez dans le dossier du dépôt.
+
+	`cd misskey`
+
+3. Checkout sur le tag de la [dernière version](https://github.com/syuilo/misskey/releases/latest).
+
+	`git checkout master`
 
 *2.* Configuration de Misskey
 ----------------------------------------------------------------
@@ -38,9 +46,9 @@ Parfait, Vous avez un environnement prêt pour démarrer Misskey.
 Utilisez la commande `docker-compose up -d`. GLHF!
 
 ### How to update your Misskey server to the latest version
-1. `git fetch`
+1. `git stash`
-2. `git stash`
+2. `git checkout master`
-3. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)`
+3. `git pull`
 4. `git stash pop`
 5. `docker-compose build`
 6. Consultez le [ChangeLog](../CHANGELOG.md) pour avoir les éventuelles informations de migration
@@ -52,14 +60,28 @@ Utilisez la commande `docker-compose up -d`. GLHF!
 ### Configuration d'ElasticSearch (pour la fonction de recherche)
 *1.* Préparation de l'environnement
 ----------------------------------------------------------------
-1. `mkdir elasticsearch && chown 1000:1000 elasticsearch` Permet de créer le dossier d'accueil de la base ElasticSearch aves les bons droits
+1. Permet de créer le dossier d'accueil de la base ElasticSearch aves les bons droits
-2. `sysctl -w vm.max_map_count=262144` Augmente la valeur max du paramètre map_count du système (valeur minimum pour pouvoir lancer ES)
+
+	`mkdir elasticsearch && chown 1000:1000 elasticsearch`
+
+2. Augmente la valeur max du paramètre map_count du système (valeur minimum pour pouvoir lancer ES)
+
+	`sysctl -w vm.max_map_count=262144`
 
 *2.* Après lancement du docker-compose, initialisation de la base ElasticSearch
 ----------------------------------------------------------------
-1. `docker-compose -it web /bin/sh` Connexion dans le conteneur web
+1. Connexion dans le conteneur web
-2. `apk add curl` Ajout du paquet curl
+
-3. `curl -X PUT "es:9200/misskey" -H 'Content-Type: application/json' -d'{ "settings" : { "index" : { } }}'` Création de la base ES
+	`docker-compose -it web /bin/sh`
+
+2. Ajout du paquet curl
+
+	`apk add curl`
+
+3. Création de la base ES
+
+	`curl -X PUT "es:9200/misskey" -H 'Content-Type: application/json' -d'{ "settings" : { "index" : { } }}'`
+
 4. `exit`
 
 ----------------------------------------------------------------

docs/docker.ja.md

@@ -9,9 +9,17 @@ Dockerを使ったMisskey構築方法
 
 *1.* Misskeyのダウンロード
 ----------------------------------------------------------------
-1. `git clone -b master git://github.com/syuilo/misskey.git` masterブランチからMisskeyレポジトリをクローン
+1. masterブランチからMisskeyレポジトリをクローン
-2. `cd misskey` misskeyディレクトリに移動
+
-3. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)` [最新のリリース](https://github.com/syuilo/misskey/releases/latest)を確認
+	`git clone -b master git://github.com/syuilo/misskey.git`
+
+2. misskeyディレクトリに移動
+
+	`cd misskey`
+
+3. [最新のリリース](https://github.com/syuilo/misskey/releases/latest)を確認
+
+	`git checkout master`
 
 *2.* 設定ファイルの作成と編集
 ----------------------------------------------------------------
@@ -57,7 +65,13 @@ cp docker_example.env docker.env
 
 `docker-compose build`
 
-*5.* 以上です！
+*5.* データベースを初期化
+----------------------------------------------------------------
+``` shell
+docker-compose run --rm web npm run init
+```
+
+*6.* 以上です！
 ----------------------------------------------------------------
 お疲れ様でした。これでMisskeyを動かす準備は整いました。
 
@@ -65,9 +79,9 @@ cp docker_example.env docker.env
 `docker-compose up -d`するだけです。GLHF!
 
 ### Misskeyを最新バージョンにアップデートする方法:
-1. `git fetch`
+1. `git stash`
-2. `git stash`
+2. `git checkout master`
-3. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)`
+3. `git pull`
 4. `git stash pop`
 5. `docker-compose build`
 6. [ChangeLog](../CHANGELOG.md)でマイグレーション情報を確認する

docs/examples/misskey.nginx

@@ -29,7 +29,7 @@ server {
     listen [::]:443 http2;
     server_name example.tld;
     ssl on;
-		ssl_session_cache shared:ssl_session_cache:10m;
+    ssl_session_cache shared:ssl_session_cache:10m;
 
     # To use Let's Encrypt certificate
     ssl_certificate     /etc/letsencrypt/live/example.tld/fullchain.pem;

docs/setup.en.md

@@ -32,15 +32,32 @@ Please install and setup these softwares:
 
 *3.* Install Misskey
 ----------------------------------------------------------------
-1. `su - misskey` Connect to misskey user.
+1. Connect to misskey user.
-2. `git clone -b master git://github.com/syuilo/misskey.git` Clone the misskey repo from master branch.
+
-3. `cd misskey` Navigate to misskey directory
+	`su - misskey`
-4. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)` Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest)
+
-5. `npm install` Install misskey dependencies.
+2. Clone the misskey repo from master branch.
+
+	`git clone -b master git://github.com/syuilo/misskey.git`
+
+3. Navigate to misskey directory
+
+	`cd misskey`
+
+4. Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest)
+
+	`git checkout master`
+
+5. Install misskey dependencies.
+
+	`npm install`
 
 *4.* Configure Misskey
 ----------------------------------------------------------------
-1. `cp .config/example.yml .config/default.yml` Copy the `.config/example.yml` and rename it to `default.yml`.
+1. Copy the `.config/example.yml` and rename it to `default.yml`.
+
+	`cp .config/example.yml .config/default.yml`
+
 2. Edit `default.yml`
 
 *5.* Build Misskey
@@ -74,37 +91,45 @@ Just `NODE_ENV=production npm start`. GLHF!
 
 ### Launch with systemd
 
-1. Create a systemd service here: `/etc/systemd/system/misskey.service`
+1. Create a systemd service here
+
+	`/etc/systemd/system/misskey.service`
+
 2. Edit it, and paste this and save:
 
-```
+	```
-[Unit]
+	[Unit]
-Description=Misskey daemon
+	Description=Misskey daemon
 
-[Service]
+	[Service]
-Type=simple
+	Type=simple
-User=misskey
+	User=misskey
-ExecStart=/usr/bin/npm start
+	ExecStart=/usr/bin/npm start
-WorkingDirectory=/home/misskey/misskey
+	WorkingDirectory=/home/misskey/misskey
-Environment="NODE_ENV=production"
+	Environment="NODE_ENV=production"
-TimeoutSec=60
+	TimeoutSec=60
-StandardOutput=syslog
+	StandardOutput=syslog
-StandardError=syslog
+	StandardError=syslog
-SyslogIdentifier=misskey
+	SyslogIdentifier=misskey
-Restart=always
+	Restart=always
 
-[Install]
+	[Install]
-WantedBy=multi-user.target
+	WantedBy=multi-user.target
-```
+	```
 
-3. `systemctl daemon-reload ; systemctl enable misskey` Reload systemd and enable the misskey service.
+3. Reload systemd and enable the misskey service.
-4. `systemctl start misskey` Start the misskey service.
+
+	`systemctl daemon-reload ; systemctl enable misskey`
+
+4. Start the misskey service.
+
+	`systemctl start misskey`
 
 You can check if the service is running with `systemctl status misskey`.
 
 ### How to update your Misskey server to the latest version
-1. `git fetch`
+1. `git checkout master`
-2. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)`
+2. `git pull`
 3. `npm install`
 4. `NODE_ENV=production npm run build`
 5. Check [ChangeLog](../CHANGELOG.md) for migration information

docs/setup.fr.md

@@ -32,15 +32,32 @@ Installez les paquets suivants :
 
 *3.* Installation de Misskey
 ----------------------------------------------------------------
-1. `su - misskey` Basculez vers l'utilisateur misskey.
+1. Basculez vers l'utilisateur misskey.
-2. `git clone -b master git://github.com/syuilo/misskey.git` Clonez la branche master du dépôt misskey.
+
-3. `cd misskey` Accédez au dossier misskey.
+	`su - misskey`
-4. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)` Checkout sur le tag de la [version la plus récente](https://github.com/syuilo/misskey/releases/latest)
+
-5. `npm install` Installez les dépendances de misskey.
+2. Clonez la branche master du dépôt misskey.
+
+	`git clone -b master git://github.com/syuilo/misskey.git`
+
+3. Accédez au dossier misskey.
+
+	`cd misskey`
+
+4. Checkout sur le tag de la [version la plus récente](https://github.com/syuilo/misskey/releases/latest)
+
+	`git checkout master`
+ 
+5. Installez les dépendances de misskey.
+
+	`npm install`
 
 *4.* Création du fichier de configuration
 ----------------------------------------------------------------
-1. `cp .config/example.yml .config/default.yml` Copiez le fichier `.config/example.yml` et renommez-le`default.yml`.
+1. Copiez le fichier `.config/example.yml` et renommez-le`default.yml`.
+
+	`cp .config/example.yml .config/default.yml`
+
 2. Editez le fichier `default.yml`
 
 *5.* Construction de Misskey
@@ -68,37 +85,45 @@ Lancez tout simplement `NODE_ENV=production npm start`. Bonne chance et amusez-v
 
 ### Démarrage avec systemd
 
-1. Créez un service systemd sur : `/etc/systemd/system/misskey.service`
+1. Créez un service systemd sur
+
+	`/etc/systemd/system/misskey.service`
+
 2. Editez-le puis copiez et coller ceci dans le fichier :
 
-```
+	```
-[Unit]
+	[Unit]
-Description=Misskey daemon
+	Description=Misskey daemon
 
-[Service]
+	[Service]
-Type=simple
+	Type=simple
-User=misskey
+	User=misskey
-ExecStart=/usr/bin/npm start
+	ExecStart=/usr/bin/npm start
-WorkingDirectory=/home/misskey/misskey
+	WorkingDirectory=/home/misskey/misskey
-Environment="NODE_ENV=production"
+	Environment="NODE_ENV=production"
-TimeoutSec=60
+	TimeoutSec=60
-StandardOutput=syslog
+	StandardOutput=syslog
-StandardError=syslog
+	StandardError=syslog
-SyslogIdentifier=misskey
+	SyslogIdentifier=misskey
-Restart=always
+	Restart=always
 
-[Install]
+	[Install]
-WantedBy=multi-user.target
+	WantedBy=multi-user.target
-```
+	```
 
-3. `systemctl daemon-reload ; systemctl enable misskey` Redémarre systemd et active le service misskey.
+3. Redémarre systemd et active le service misskey.
-4. `systemctl start misskey` Démarre le service misskey.
+
+	`systemctl daemon-reload ; systemctl enable misskey`
+
+4. Démarre le service misskey.
+
+	`systemctl start misskey`
 
 Vous pouvez vérifier si le service a démarré en utilisant la commande `systemctl status misskey`.
 
 ### Méthode de mise à jour vers la plus récente version de Misskey
-1. `git fetch`
+1. `git checkout master`
-2. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)`
+2. `git pull`
 3. `npm install`
 4. `NODE_ENV=production npm run build`
 5. Consultez [ChangeLog](../CHANGELOG.md) pour les information de migration.

docs/setup.ja.md

@@ -33,15 +33,32 @@ adduser --disabled-password --disabled-login misskey
 
 *3.* Misskeyのインストール
 ----------------------------------------------------------------
-1. `su - misskey` misskeyユーザーを使用
+1. misskeyユーザーを使用
-2. `git clone -b master git://github.com/syuilo/misskey.git` masterブランチからMisskeyレポジトリをクローン
+
-3. `cd misskey` misskeyディレクトリに移動
+	`su - misskey`
-4. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)` [最新のリリース](https://github.com/syuilo/misskey/releases/latest)を確認
+
-5. `npm install` Misskeyの依存パッケージをインストール
+2. masterブランチからMisskeyレポジトリをクローン
+
+	`git clone -b master git://github.com/syuilo/misskey.git`
+
+3. misskeyディレクトリに移動
+
+	`cd misskey`
+
+4. [最新のリリース](https://github.com/syuilo/misskey/releases/latest)を確認
+
+	`git checkout master`
+
+5. Misskeyの依存パッケージをインストール
+
+	`npm install`
 
 *4.* 設定ファイルを作成する
 ----------------------------------------------------------------
-1. `cp .config/example.yml .config/default.yml` `.config/example.yml`をコピーし名前を`default.yml`にする。
+1. `.config/example.yml`をコピーし名前を`default.yml`にする。
+
+	`cp .config/example.yml .config/default.yml`
+
 2. `default.yml` を編集する。
 
 *5.* Misskeyのビルド
@@ -73,38 +90,47 @@ npm run init
 `NODE_ENV=production npm start`するだけです。GLHF!
 
 ### systemdを用いた起動
-1. systemdサービスのファイルを作成: `/etc/systemd/system/misskey.service`
+1. systemdサービスのファイルを作成
+
+	`/etc/systemd/system/misskey.service`
+
 2. エディタで開き、以下のコードを貼り付けて保存:
 
-```
+	```
-[Unit]
+	[Unit]
-Description=Misskey daemon
+	Description=Misskey daemon
 
-[Service]
+	[Service]
-Type=simple
+	Type=simple
-User=misskey
+	User=misskey
-ExecStart=/usr/bin/npm start
+	ExecStart=/usr/bin/npm start
-WorkingDirectory=/home/misskey/misskey
+	WorkingDirectory=/home/misskey/misskey
-Environment="NODE_ENV=production"
+	Environment="NODE_ENV=production"
-TimeoutSec=60
+	TimeoutSec=60
-StandardOutput=syslog
+	StandardOutput=syslog
-StandardError=syslog
+	StandardError=syslog
-SyslogIdentifier=misskey
+	SyslogIdentifier=misskey
-Restart=always
+	Restart=always
 
-[Install]
+	[Install]
-WantedBy=multi-user.target
+	WantedBy=multi-user.target
-```
+	```
-CentOSで1024以下のポートを使用してMisskeyを使用する場合は`ExecStart=/usr/bin/sudo /usr/bin/npm start`に変更する必要があります。
 
-3. `systemctl daemon-reload ; systemctl enable misskey` systemdを再読み込みしmisskeyサービスを有効化
+	CentOSで1024以下のポートを使用してMisskeyを使用する場合は`ExecStart=/usr/bin/sudo /usr/bin/npm start`に変更する必要があります。
-4. `systemctl start misskey` misskeyサービスの起動
+
+3. systemdを再読み込みしmisskeyサービスを有効化
+
+	`systemctl daemon-reload ; systemctl enable misskey`
+
+4. misskeyサービスの起動
+
+	`systemctl start misskey`
 
 `systemctl status misskey`と入力すると、サービスの状態を調べることができます。
 
 ### Misskeyを最新バージョンにアップデートする方法:
-1. `git fetch`
+1. `git checkout master`
-2. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)`
+2. `git pull`
 3. `npm install`
 4. `NODE_ENV=production npm run build`
 5. [ChangeLog](../CHANGELOG.md)でマイグレーション情報を確認する

locales/cs-CZ.yml

@@ -69,6 +69,15 @@ common:
   following: "Sledovaní"
   followers: "Sledující"
   favorites: "Oblíbené"
+  permissions:
+    "read:account": "Zobrazit informace o účtu"
+    "read:drive": "Prohlížet Disk"
+    "write:drive": "Pracovat s Diskem"
+    "read:favorites": "Prohlížet oblíbené"
+    "read:messaging": "Prohlížet konverzaci"
+    "write:messaging": "Pracovat s konverzaci"
+    "read:mutes": "Prohlížet ztlumené"
+    "write:votes": "Hlasovat"
   empty-timeline-info:
     follow-users-to-make-your-timeline: "Poznámky sledujících se zobrazí ve vaší časové ose"
     explore: "Najít uživatele"
@@ -1111,7 +1120,7 @@ mobile/views/components/post-form.vue:
   reply: "Odpovědět"
   renote: "Renotovat"
   reply-placeholder: "Odpovědět na tento příspěvěk"
-  location-alert: "Vaše zařízení nepodporuje lokační službu"
+  geolocation-alert: "Vaše zařízení nepodporuje lokační službu"
   error: "Chyba"
   username-prompt: "Zadejte uživatelské jméno"
 mobile/views/components/sub-note-content.vue:
@@ -1182,4 +1191,3 @@ deck/deck.user-column.vue:
   activity: "Aktivita"
 dev/views/new-app.vue:
   app-name-desc: "Jméno vaší aplikace"
-  app-desc: "Stručný popis nebo představení vaší aplikace."

locales/de-DE.yml

@@ -20,6 +20,13 @@ common:
   load-more: "Mehr laden"
   enter-password: "Bitte Passwort eingeben"
   2fa: "Zwei-Faktor-Authentifizierung"
+  customize-home: "Layout Anpassen"
+  featured-notes: "Hervorgehobene Beiträge"
+  dark-mode: "Dunkler Modus"
+  signin: "Einloggen"
+  signup: "Registrieren"
+  signout: "Ausloggen"
+  reload-to-apply-the-setting: "Die Seite muss zum Übernehmen dieser Einstellung aktualisiert werden. Soll die Seite jetzt neu geladen werden?"
   got-it: "Verstanden!"
   customization-tips:
     title: "Anpassung-Tipps"
@@ -27,6 +34,7 @@ common:
   notification:
     file-uploaded: "Datei hochgeladen!"
     message-from: "Nachricht von {}:"
+    reversi-invited: "Zu einem Spiel eingeladen"
     reversi-invited-by: "Eingeladen von {}:"
     notified-by: "Benachrichtigt von {}:"
     reply-from: "Antwort von {}:"
@@ -47,7 +55,24 @@ common:
   drive: "Drive"
   messaging: "Unterhaltungen"
   home: "Home"
-  favorites: "Diese Notiz favorisieren"
+  deck: "Stapel"
+  timeline: "Zeitleiste"
+  explore: "Entdecken"
+  following: "Folgt"
+  followers: "Folgende"
+  favorites: "Diesen Beitrag favorisieren"
+  permissions:
+    "read:account": "Accountinformationen anzeigen."
+    "write:account": "Accountinformationen bearbeiten."
+    "read:drive": "Dateien anzeigen"
+    "write:drive": "Dateien bearbeiten"
+    "read:favorites": "Favoriten anzeigen"
+    "read:messaging": "Unterhaltung anzeigen"
+    "write:messaging": "Unterhaltung bearbeiten"
+    "write:votes": "Abstimmen"
+  empty-timeline-info:
+    follow-users-to-make-your-timeline: "Beiträge von Benutzern, denen du folgst, werden in der Zeitleiste angezeigt."
+    explore: "Benutzer finden"
   weekday-short:
     sunday: "So"
     monday: "Mo"
@@ -78,11 +103,11 @@ common:
   note-visibility:
     public: "Öffentlich"
     home: "Startseite"
-    home-desc: "Nur auf die Startseite posten"
+    home-desc: "Auf die Startseite posten"
     followers: "Abonnenten"
     followers-desc: "Nur für diejenigen sichtbar, die dir folgen"
     specified: "Direkt"
-    specified-desc: "Nur für bestimmte Benutzer posten"
+    specified-desc: "Nur für bestimmte Benutzer sichtbar"
     local-public: "Öffentlich (nur lokal)"
     local-home: "Home (nur lokal)"
     local-followers: "Follower (nur lokal)"
@@ -92,11 +117,34 @@ common:
     c: "Was geht dir durch den Kopf?"
     d: "Willst du etwas sagen?"
     e: "Schreib hier etwas!"
-    f: "Warte darauf, das du schreibst."
+    f: "Warte darauf, das du schreibst..."
+  settings: "Einstellungen"
   _settings:
     profile: "Dein Profil"
     notification: "Benachrichtigungen"
+    apps: "Anwendungen"
+    tags: "Hashtags"
+    mute-and-block: "Stummschalten/Blocken"
+    blocking: "Blocken"
+    security: "Sicherheit"
+    signin: "Login-Verlauf"
     password: "Passwort"
+    other: "Mehr"
+    appearance: "Designs"
+    behavior: "Verhalten"
+    fetch-on-scroll: "Unendliches laden beim scrollen"
+    fetch-on-scroll-desc: "Wenn beim scrollen das Ende erreicht wird, lädt die Anwendung automatisch neue Inhalte nach."
+    note-visibility: "Sichtbarkeit von Beiträgen"
+    default-note-visibility: "Die Standardsichtbarkeit"
+    remember-note-visibility: "Erinnerung an Sichtbarkeit von Beiträgen"
+    web-search-engine: "Web-Suchmaschine"
+    web-search-engine-desc: "Beispiel: https://www.google.de/search?q={{query}}"
+    keep-cw: "Inhaltswarnung beibehalten"
+    keep-cw-desc: "Wenn auf einen Beitrag geantwortet wird, wird die Inhaltswarnung des Originalbeitrags übernommen."
+    i-like-sushi: "Ich bevorzuge Sushi anstelle von Pudding"
+    show-reversi-board-labels: "Zeige Reihen- und Spaltenbeschreibungen in Reversi an"
+    use-avatar-reversi-stones: "Avatar als Stein in Reversi anzeigen"
+    disable-animated-mfm: "Animierten Text in Beiträgen deaktivieren"
   search: "Suche"
   delete: "Löschen"
   loading: "Laden"
@@ -104,7 +152,7 @@ common:
   update-available: "Eine neue Version von Misskey ist verfügbar ({newer}, aktuell ist {current}). Lade die Seite neu um die aktuelle Version zu laden"
   my-token-regenerated: "Dein Token wurde generiert. Du wirst jetzt abgemeldet."
   verified-user: "Verifizierter Benutzer"
-  do-not-use-in-production: "Dies ist eine Entwicklungsversion. Nicht in einer Produktionsumgebung verwenden."
+  do-not-use-in-production: "Dies ist eine Entwicklungsversion. Nicht in einer Produktivumgebung verwenden."
   error:
     retry: "Erneut versuchen"
   reversi:
@@ -118,7 +166,7 @@ common:
     analog-clock: "Analoge Uhr"
     profile: "Profil"
     calendar: "Kalender"
-    timemachine: "Kalender (Zeitmaschiene)"
+    timemachine: "Kalender (Zeitmaschine)"
     activity: "Aktivitäten"
     rss: "RSS Leser"
     memo: "Notizen"
@@ -129,7 +177,7 @@ common:
     notifications: "Benachrichtigungen"
     users: "Empfohlene Benutzer"
     polls: "Umfrage"
-    post-form: "Beitragsform"
+    post-form: "\"Neuer Beitrag\"-Formular"
     server: "Server-Info"
     nav: "Navigation"
     tips: "Tipps"
@@ -179,7 +227,7 @@ common/views/components/games/reversi/reversi.room.vue:
   ready: "Bereit"
 common/views/components/connect-failed.vue:
   title: "Verbindung zum Server ist fehlgeschlagen"
-  description: "Es gibt entweder ein Problem mit deiner Internetverbindung, der Server ist nicht erreichbar oder wird gerade gewartet. Bitte versuche es später noch einmal."
+  description: "Entweder gibt es ein Problem mit deiner Internetverbindung oder der Server ist zur Zeit nicht erreichbar oder wird gewartet. Bitte versuche es später noch einmal."
   thanks: "Vielen Dank für das nutzen von Misskey."
   troubleshoot: "Problembehandlung"
 common/views/components/connect-failed.troubleshooter.vue:
@@ -196,8 +244,8 @@ common/views/components/connect-failed.troubleshooter.vue:
   no-internet: "Keine Internetverbindung"
   no-internet-desc: "Bitte vergewissere dich, dass du mit dem Internet verbunden bist."
   no-server: "Verbindung mit dem Server nicht möglich"
-  no-server-desc: "Die Internetverbindung scheint in Ordnung zu sein, aber eine Verbindung mit dem Misskey Server konnte nicht hergestellt werden. Möglicherweise ist dieser zur Zeit offline oder in der Wartung, bitte versuche es später noch einmal."
+  no-server-desc: "Die Internetverbindung scheint in Ordnung zu sein, aber eine Verbindung mit dem Misskey-Server konnte nicht hergestellt werden. Möglicherweise ist dieser zur Zeit offline oder wird gewartet. Bitte versuche es später noch einmal."
-  success: "Erfolgreich mit dem Misskey Server verbunden"
+  success: "Erfolgreich mit dem Misskey-Server verbunden"
   success-desc: "Die Verbindung scheint zu funktionieren. Bitte lade die Seite neu."
   flush: "Cache leeren"
   set-version: "Version angeben"
@@ -224,6 +272,7 @@ common/views/components/theme.vue:
   invalid-theme: "Thema ist ungültig"
   already-installed: "Thema ist bereits installiert"
   author: "Autor"
+  desc: "Beschreibung"
   export: "Exportieren"
   import: "Importieren"
 common/views/components/cw-button.vue:
@@ -251,15 +300,15 @@ common/views/components/nav.vue:
   status: "Status"
   wiki: "Wiki"
   donors: "Spender"
-  repository: "Projektarchiv"
+  repository: "Quellcode"
   develop: "Entwickler"
   feedback: "Feedback"
 common/views/components/note-menu.vue:
-  favorite: "Diese Notiz favorisieren"
+  favorite: "Diesen Beitrag favorisieren"
   unfavorite: "Aus Favoriten entfernen"
   pin: "An die Profilseite pinnen"
   delete: "Löschen"
-  delete-confirm: "Diesen Post löschen?"
+  delete-confirm: "Diesen Beitrag löschen?"
   remote: "Auf Quelle anzeigen"
 common/views/components/poll.vue:
   vote-to: "Stimme für '{}'"
@@ -296,8 +345,8 @@ common/views/components/signup.vue:
   password: "Passwort"
   password-placeholder: "Wir empfehlen mindestens 8 Zeichen"
   weak-password: "Schwaches Passwort"
-  normal-password: "Faires Passwort"
+  normal-password: "Normales Passwort"
-  strong-password: "Schwaches Passwort"
+  strong-password: "Starkes Passwort"
   retype: "Wiederholen"
   retype-placeholder: "Bitte das Passwort erneut eingeben"
   password-matched: "OK"
@@ -319,16 +368,17 @@ common/views/components/uploader.vue:
 common/views/components/visibility-chooser.vue:
   public: "Öffentlich"
   home: "Home"
-  home-desc: "Nur auf die Startseite posten"
+  home-desc: "Auf die Startseite posten"
   followers: "Folgende"
   followers-desc: "Nur für diejenigen sichtbar, die dir folgen"
   specified: "Direkt"
-  specified-desc: "Poste nur für bestimmte Benutzer"
+  specified-desc: "Nur für bestimmte Benutzer sichtbar"
   local-public: "Öffentlich (nur lokal)"
   local-home: "Home (nur lokal)"
   local-followers: "Follower (nur lokal)"
 common/views/components/profile-editor.vue:
   title: "Dein Profil"
+  name: "Name"
   avatar: "Avatar"
   banner: "Banner"
   save: "Speichern"
@@ -400,8 +450,8 @@ desktop/views/components/drive.file.vue:
     copied: "Kopieren erfolgreich"
     copied-url-to-clipboard: "URL wurde in die Zwischenablage kopiert"
 desktop/views/components/drive.folder.vue:
-  unable-to-process: "Der Vorgang konnte nicht beendet werden"
+  unable-to-process: "Der Vorgang konnte nicht abgeschlossen werden"
-  circular-reference-detected: "Das Zielverzeichnis ist ein Unterverzeichnis des Verzeichnisses welches du verschieben möchtest"
+  circular-reference-detected: "Das Zielverzeichnis ist innerhalb des Verzeichnisses, dass du verschieben möchtest"
   unhandled-error: "Unbekannter Fehler"
   contextmenu:
     move-to-this-folder: "Verschiebe in diesen Ordner"
@@ -416,7 +466,7 @@ desktop/views/components/drive.vue:
   empty-drive-description: "Du kannst rechts klicken und \"Datei hochladen\" auswählen oder eine Datei per Drag and Drop auf das Fenster ziehen."
   empty-folder: "Dieser Ordner ist leer"
   unable-to-process: "Der Vorgang konnte nicht beendet werden"
-  circular-reference-detected: "Das Zielverzeichnis ist ein Unterverzeichnis des Verzeichnisses welches du verschieben möchtest"
+  circular-reference-detected: "Das Zielverzeichnis ist innerhalb des Verzeichnisses, dass du verschieben möchtest"
   unhandled-error: "Unbekannter Fehler"
   url-upload: "Von einer URL hochladen"
   url-of-file: "URL der Datei, welche du hochladen möchtest"
@@ -440,15 +490,15 @@ desktop/views/input-dialog.vue:
   cancel: "Abbrechen"
   ok: "OK"
 desktop/views/components/note-detail.vue:
-  private: "Dieser Post ist privat"
+  private: "Dieser Beitrag ist privat"
   deleted: "Dieser Beitrag wurde entfernt"
   location: "Ort"
   renote: "Anmerkung"
   add-reaction: "Reaktion hinzufügen"
 desktop/views/components/note.vue:
   reply: "Antworten"
-  renote: "Anmerkung"
+  renote: "Anmerken"
-  private: "Dieser Post ist privat"
+  private: "Dieser Beitrag ist privat"
   deleted: "Dieser Beitrag wurde entfernt"
 desktop/views/components/notes.vue:
   error: "Laden fehlgeschlagen."
@@ -460,9 +510,9 @@ desktop/views/components/post-form.vue:
   hide-contents: "Inhalt verstecken"
   reply-placeholder: "Antworte auf diese Anmerkung..."
   quote-placeholder: "Zitiere diese Anmerkung..."
-  submit: "Beitragsform"
+  submit: "Abschicken"
   reply: "Antworten"
-  renote: "Anmerkung"
+  renote: "Anmerken"
   posted: "Gepostet!"
   replied: "Geantwortet!"
   reposted: "Weitergesagt!"
@@ -478,7 +528,7 @@ desktop/views/components/post-form.vue:
   error: "Fehler"
   enter-username: "Bitte gib einen Benutzernamen ein..."
 desktop/views/components/post-form-window.vue:
-  note: "Neue Notiz"
+  note: "Neuer Beitrag"
   reply: "Antworten"
   attaches: "{} Medien hinzugefügt"
   uploading-media: "Lade {} Medien hoch"
@@ -492,7 +542,7 @@ desktop/views/components/renote-form.vue:
   success: "Weitergesagt!"
   failure: "Weitersagen fehlgeschlagen"
 desktop/views/components/renote-form-window.vue:
-  title: "Bist du dir sicher, dass du das reposten willst?"
+  title: "Bist du dir sicher, dass du das weitersagen willst?"
 desktop/views/components/settings.2fa.vue:
   url: "https://www.google.de/intl/de/landing/2step/"
   register: "Ein Gerät registrieren"
@@ -504,6 +554,7 @@ desktop/views/components/settings.2fa.vue:
 common/views/components/api-settings.vue:
   enter-password: "Bitte Passwort eingeben"
   console:
+    parameter: "Parameter"
     send: "Senden"
 common/views/components/drive-settings.vue:
   in-use: "benutzt"
@@ -511,7 +562,7 @@ common/views/components/drive-settings.vue:
 common/views/components/mute-and-block.vue:
   save: "Speichern"
 desktop/views/components/sub-note-content.vue:
-  private: "Dieser Post ist privat"
+  private: "Dieser Beitrag ist privat"
   deleted: "Dieser Beitrag wurde entfernt"
   poll: "Umfrage"
 desktop/views/components/settings.tags.vue:
@@ -601,22 +652,22 @@ mobile/views/components/drive.file-detail.vue:
   download: "Download"
   rename: "Umbenennen"
 mobile/views/components/note.vue:
-  private: "Dieser Post ist privat"
+  private: "Dieser Beitrag ist privat"
   deleted: "Dieser Beitrag wurde entfernt"
   location: "Ort"
 mobile/views/components/note-detail.vue:
   reply: "Antworten"
-  private: "Dieser Post ist privat"
+  private: "Dieser Beitrag ist privat"
   deleted: "Dieser Beitrag wurde entfernt"
   location: "Ort"
 mobile/views/components/notifications.vue:
   empty: "Keine Benachrichtigungen"
 mobile/views/components/post-form.vue:
   reply: "Antworten"
-  renote: "Anmerkung"
+  renote: "Anmerken"
   reply-placeholder: "Antworte auf diese Anmerkung..."
 mobile/views/components/sub-note-content.vue:
-  private: "Dieser Post ist privat"
+  private: "Dieser Beitrag ist privat"
   deleted: "Dieser Beitrag wurde entfernt"
   poll: "Umfrage"
 mobile/views/components/ui.nav.vue:
@@ -633,7 +684,7 @@ mobile/views/pages/home.vue:
   global: "Global"
 mobile/views/pages/widgets.vue:
   add-widget: "Hinzufügen"
-  customization-tips: "Anpassung-Tipps"
+  customization-tips: "Anpassungs-Tipps"
 mobile/views/pages/widgets/activity.vue:
   activity: "Aktivität"
 mobile/views/pages/note.vue:
@@ -654,4 +705,47 @@ deck:
   list: "Listen"
   rename: "Umbenennen"
 deck/deck.user-column.vue:
+  following: "Folgen"
+  followers: "Folgende"
+  images: "Bilder"
   activity: "Aktivität"
+  timeline: "Zeitleiste"
+  pinned-notes: "Angeheftete Beiträge"
+docs:
+  edit-this-page-on-github: "Hast Du einen Fehler gefunden oder Lust, diese Dokumentation zu verbessern?"
+  edit-this-page-on-github-link: "Seite auf GitHub bearbeiten!"
+  api:
+    entities:
+      properties: "Eigenschaften"
+    endpoints:
+      params: "Parameter"
+      no-params: "Keine Parameter."
+      res: "Antwort"
+      require-credential: "Dieser Endpunkt erfordert eine Authentifizierung."
+      require-permission: "Dieser Endpunkt erfordert die {permission} Berechtigung."
+      has-limit: "Es gibt eine Ratenbegrenzung."
+      duration-limit: "Es sind maximal {max} Anfragen pro {duration} Millisekunden möglich."
+      min-interval-limit: "Es ist nur eine Anfrage alle {interval} Millisekunden möglich."
+      show-src: "Quellcode anzeigen."
+      show-src-link: "Quellcode auf GitHub anzeigen"
+      generated: "Dieses Dokument wird automatisch anhand der API-Definition generiert."
+    props:
+      name: "Name"
+      type: "Typ"
+      description: "Beschreibung"
+dev/views/index.vue:
+  manage-apps: "Anwendungen verwalten"
+dev/views/apps.vue:
+  manage-apps: "Anwendungen verwalten"
+  create-app: "Anwendung erstellen"
+  app-missing: "Keine Anwendungen"
+dev/views/new-app.vue:
+  create-app: "Erstelle Anwendung"
+  app-name: "Name der Anwendung"
+  app-name-desc: "Der Name der Anwendung"
+  app-overview: "Beschreibung der Anwendung"
+  callback-url: "Callback-URL (optional)"
+  callback-url-desc: "Die URL, auf die nach erfolgreicher Authentifizierung umgeleitet werden soll."
+  authority: "Berechtigungen"
+  authority-desc: "Nur die hier eingetragenen Berechtigungen, werden per API zur Verfügung stehen."
+  authority-warning: "Dies kann auch nach dem erstellen der Anwendung geändert werden, allerdings werden dann alle bisher generierten Token ungültig."

locales/en-US.yml

@@ -70,10 +70,21 @@ common:
   followers: "Followers"
   favorites: "Favorites"
   permissions:
-    'read:account': "View account information"
+    "read:account": "View account information"
-    'write:account': "Update your account information"
+    "write:account": "Update your account information"
-    'read:drive': "Browse the Drive"
+    "read:blocks": "View Blocks"
-    'write:drive': "Work with the Drive"
+    "write:blocks": "Work with Blocks"
+    "read:drive": "Browse the Drive"
+    "write:drive": "Work with the Drive"
+    "read:favorites": "View Favorites"
+    "write:favorites": "Work with Favorites"
+    "read:following": "View Follower info"
+    "write:following": "Work with Follow info"
+    "read:messaging": "View Messaging"
+    "write:messaging": "Work with Messaging"
+    "read:mutes": "View Muted"
+    "write:mutes": "Work with Muted"
+    "write:votes": "Vote"
   empty-timeline-info:
     follow-users-to-make-your-timeline: "Following users will show their posts in your timeline."
     explore: "Find users"
@@ -281,6 +292,7 @@ common:
     nav: "Navigation"
     tips: "Tips"
     hashtags: "Hashtags"
+    queue: "Queue"
   dev: "Failed to create the application. Please try again."
   ai-chan-kawaii: "Ai-chan kawaii!"
   you: "You"
@@ -1462,7 +1474,7 @@ mobile/views/components/post-form.vue:
   quote-placeholder: "Quote this post... (optional)"
   reply-placeholder: "Reply to this note..."
   cw-placeholder: "Comments for the post (optional)"
-  location-alert: "Your device does not provide location services"
+  geolocation-alert: "Your device does not provide location services."
   error: "Error"
   username-prompt: "Enter user name"
 mobile/views/components/sub-note-content.vue:
@@ -1615,10 +1627,7 @@ dev/views/new-app.vue:
   create-app: "Creating application"
   app-name: "Application name"
   app-name-desc: "The name of your app"
-  app-name-ex: "ex) Misskey for iOS"
   app-overview: "Application summary"
-  app-desc: "A brief description or introduction of your app."
-  app-desc-ex: "ex) Misskey iOS client."
   callback-url: "The callback URL (optional)"
   callback-url-desc: "The URL to redirect to after the user is authenticated via the authentication form."
   authority: "Permissions"

locales/es-ES.yml

@@ -20,8 +20,15 @@ common:
   application-authorization: "Autorizaciones de la aplicación."
   close: "Cerrar"
   do-not-copy-paste: "Por favor no copies código aquí. Tu cuenta puede resultar comprometida."
+  load-more: "Leer más"
   enter-password: "Escribe una contraseña"
   2fa: "Autenticación de dos factores"
+  customize-home: "Personaliza la página principal"
+  featured-notes: "Destacados"
+  dark-mode: "Modo oscuro"
+  signin: "Iniciar sesión"
+  signup: "¡Regístrate!"
+  signout: "Cerrar sesión"
   got-it: "¡Listo!"
   customization-tips:
     title: "Consejos de personalización"
@@ -50,8 +57,22 @@ common:
   drive: "Drive"
   messaging: "Conversación"
   home: "Inicio"
+  deck: "Deck"
+  timeline: "Timeline"
+  explore: "Explorar"
   following: "Siguiendo"
+  followers: "Seguidores"
   favorites: "Me gusta esta nota"
+  permissions:
+    "read:account": "Ver información de la cuenta"
+    "write:account": "Editar información de la cuenta"
+    "read:blocks": "Ver bloques"
+    "write:blocks": "Editar bloques"
+    "read:favorites": "Ver favoritos"
+    "write:favorites": "Editar favoritos"
+    "read:messaging": "Ver conversación"
+    "read:notifications": "Ver notificaciones"
+    "write:votes": "Vota"
   weekday-short:
     sunday: "domingo"
     monday: "lunes"
@@ -97,12 +118,24 @@ common:
     d: "¿Quieres decir algo?"
     e: "¡Escribe aquí!"
     f: "Esperando a que escribas algo..."
+  settings: "Configuración"
   _settings:
     profile: "Tu perfil"
     notification: "Notificaciones"
+    apps: "Aplicaciones"
     tags: "Etiquetas"
+    mute-and-block: "Silenciar/Bloquear"
     blocking: "Bloquear"
+    security: "Seguridad"
     password: "Contraseña"
+    other: "Otros"
+    appearance: "Diseño"
+    behavior: "Comportamiento"
+    fetch-on-scroll-desc: "Cuando te deslizas al final de la página nuevo contenido se carga automáticamente."
+    note-visibility: "Visibilidad de la publicación"
+    default-note-visibility: "Rango de publicación predeterminado"
+    web-search-engine: "Buscador web"
+    web-search-engine-desc: "Ejemplo: https://www.google.com/?#q={{query}}"
     use-os-default-emojis: "Usar los emoticonos estándar del sistema operativo"
     line-width: "Grosor de línea"
     line-width-thick: "Grosor"
@@ -128,6 +161,19 @@ common:
     contrasted-acct: "Añadir contraste al nombre de usuario"
     wallpaper: "Fondo de pantalla"
     choose-wallpaper: "Escoge un fondo de pantalla"
+    delete-wallpaper: "Quitar fondo de pantalla"
+    show-clock-on-header: "Muestra el reloj en la parte superior derecha"
+    timeline: "Timeline"
+    sound: "Sonido"
+    enable-sounds: "Habilitar sonido"
+    volume: "Volúmen"
+    test: "Prueba"
+    version: "Versión"
+    no-updates: "No hay actualizaciones disponibles"
+    no-updates-desc: "Tu Misskey está actualizado"
+    update-available: "¡Una nueva versión está disponible!"
+    update-available-desc: "Las actualizaciones se aplicarán cuando la página se vuelva a cargar."
+    advanced-settings: "Configuraciones avanzadas"
     navbar-position-left: "Izquierda"
   search: "Buscar"
   delete: "eliminar"
@@ -869,6 +915,7 @@ mobile/views/components/post-form.vue:
   reply: "Responder"
   renote: "Republicar"
   reply-placeholder: "Responder a esta nota..."
+  geolocation-alert: "Tu dispositivo no tiene soporte de geolocalización."
 mobile/views/components/sub-note-content.vue:
   private: "Esta publicación es privada"
   deleted: "Esta publicación ha sido removida"

locales/fr-FR.yml

@@ -68,10 +68,11 @@ common:
   followers: "Abonné·e·s"
   favorites: "Mettre cette note en favoris"
   permissions:
-    'read:account': "Afficher les informations du compte"
+    "read:account": "Afficher les informations du compte"
-    'write:account': "Mettre à jour les informations de votre compte"
+    "write:account": "Mettre à jour les informations de votre compte"
-    'read:drive': "Parcourir le Drive"
+    "read:drive": "Parcourir le Drive"
-    'write:drive': "Écrire sur le Drive"
+    "write:drive": "Écrire sur le Drive"
+    "write:votes": "Vote"
   empty-timeline-info:
     follow-users-to-make-your-timeline: "Les utilisateurs suivants afficheront leurs publications sur votre fil."
     explore: "Trouver des utilisateurs"
@@ -274,6 +275,7 @@ common:
     nav: "Navigation"
     tips: "Conseils"
     hashtags: "Hashtags"
+    queue: "File d'attente"
   dev: "Échec lors de la création de l’application. Veuillez réessayer."
   ai-chan-kawaii: "Ai-Chan est mignonne !"
   you: "Vous"
@@ -1434,7 +1436,7 @@ mobile/views/components/post-form.vue:
   quote-placeholder: "Citer ce billet ... (Facultatif)"
   reply-placeholder: "Répondre à cette note"
   cw-placeholder: "Commenter le contenu (optionnel)"
-  location-alert: "Votre appareil ne prend pas en charge les services de localisation"
+  geolocation-alert: "Votre appareil ne prend pas en charge les services de localisation"
   error: "Erreur"
   username-prompt: "Saisir un nom d'utilisateur"
 mobile/views/components/sub-note-content.vue:
@@ -1586,10 +1588,7 @@ dev/views/new-app.vue:
   create-app: "Création d’une application"
   app-name: "Nom de l’application"
   app-name-desc: "Le nom de votre application"
-  app-name-ex: "p. ex. Misskey pour iOS"
   app-overview: "Description courte de l’application"
-  app-desc: "Brève description introductive à votre application."
-  app-desc-ex: "p. ex) Misskey pour iOS"
   callback-url: "L’Url de callback (facultatif)"
   callback-url-desc: "Vous pouvez définir l’URL de redirection lorsque l’utilisateur s’est authentifié via formulaire d’authentification."
   authority: "Autorisations "

locales/ja-JP.yml

@@ -35,6 +35,7 @@ common:
   signup: "新規登録"
   signout: "ログアウト"
   reload-to-apply-the-setting: "この設定を反映するにはページをリロードする必要があります。今すぐリロードしますか？"
+  fetching-as-ap-object: "連合に照会中"
 
   got-it: "わかった"
   customization-tips:
@@ -74,10 +75,26 @@ common:
   favorites: "お気に入り"
 
   permissions:
-    'read:account': "アカウントの情報を見る"
+    "read:account": "アカウントの情報を見る"
-    'write:account': "アカウントの情報を変更する"
+    "write:account": "アカウントの情報を変更する"
-    'read:drive': "ドライブを見る"
+    "read:blocks": "ブロックを見る"
-    'write:drive': "ドライブを操作する"
+    "write:blocks": "ブロックを操作する"
+    "read:drive": "ドライブを見る"
+    "write:drive": "ドライブを操作する"
+    "read:favorites": "お気に入りを見る"
+    "write:favorites": "お気に入りを操作する"
+    "read:following": "フォローの情報を見る"
+    "write:following": "フォロー・フォロー解除する"
+    "read:messaging": "トークを見る"
+    "write:messaging": "トークを操作する"
+    "read:mutes": "ミュートを見る"
+    "write:mutes": "ミュートを操作する"
+    "write:notes": "投稿を作成・削除する"
+    "read:notifications": "通知を見る"
+    "write:notifications": "通知を操作する"
+    "read:reactions": "リアクションを見る"
+    "write:reactions": "リアクションを操作する"
+    "write:votes": "投票する"
 
   empty-timeline-info:
     follow-users-to-make-your-timeline: "ユーザーをフォローすると投稿がタイムラインに表示されます。"
@@ -297,6 +314,7 @@ common:
     nav: "ナビゲーション"
     tips: "ヒント"
     hashtags: "ハッシュタグ"
+    queue: "キュー"
 
   dev: "アプリの作成に失敗しました。再度お試しください。"
   ai-chan-kawaii: "藍ちゃかわいい"
@@ -510,8 +528,12 @@ common/views/components/user-menu.vue:
   mention: "メンション"
   mute: "ミュート"
   unmute: "ミュート解除"
+  mute-confirm: "このユーザーをミュートしますか？"
+  unmute-confirm: "このユーザーをミュート解除しますか？"
   block: "ブロック"
   unblock: "ブロック解除"
+  block-confirm: "このユーザーをブロックしますか？"
+  unblock-confirm: "このユーザーをブロック解除しますか？"
   push-to-list: "リストに追加"
   select-list: "リストを選択してください"
   report-abuse: "スパムを報告"
@@ -519,8 +541,12 @@ common/views/components/user-menu.vue:
   report-abuse-reported: "管理者に報告されました。ご協力ありがとうございました。"
   silence: "サイレンス"
   unsilence: "サイレンス解除"
+  silence-confirm: "このユーザーをサイレンスしますか？"
+  unsilence-confirm: "このユーザーをサイレンス解除しますか？"
   suspend: "凍結"
   unsuspend: "凍結解除"
+  suspend-confirm: "このユーザーを凍結しますか？"
+  unsuspend-confirm: "このユーザーを凍結解除しますか？"
 
 common/views/components/poll.vue:
   vote-to: "「{}」に投票する"
@@ -722,6 +748,10 @@ common/views/components/user-list-editor.vue:
   delete-are-you-sure: "リスト「$1」を削除しますか？"
   deleted: "削除しました"
 
+common/views/components/user-lists.vue:
+  create-list: "リストを作成"
+  list-name: "リスト名"
+
 common/views/widgets/broadcast.vue:
   fetching: "確認中"
   no-broadcasts: "お知らせはありません"
@@ -1128,8 +1158,6 @@ desktop/views/components/received-follow-requests-window.vue:
 
 desktop/views/components/user-lists-window.vue:
   title: "リスト"
-  create-list: "リストを作成"
-  list-name: "リスト名"
 
 desktop/views/components/user-preview.vue:
   notes: "投稿"
@@ -1319,7 +1347,9 @@ admin/views/users.vue:
   unsuspend-confirm: "凍結を解除しますか？"
   unsuspended: "凍結を解除しました"
   make-silence: "サイレンス"
+  silence-confirm: "サイレンスしますか？"
   unmake-silence: "サイレンスの解除"
+  unsilence-confirm: "サイレンスを解除しますか？"
   verify: "公式アカウントにする"
   verify-confirm: "公式アカウントにしますか？"
   verified: "公式アカウントにしました"
@@ -1533,6 +1563,7 @@ desktop/views/widgets/polls.vue:
 desktop/views/widgets/post-form.vue:
   title: "投稿"
   note: "投稿"
+  something-happened: "何らかの事情で投稿できませんでした。"
 
 desktop/views/widgets/profile.vue:
   update-banner: "クリックでバナー編集"
@@ -1555,12 +1586,11 @@ mobile/views/components/drive.vue:
   file-count: "ファイル"
   nothing-in-drive: "ドライブには何もありません"
   folder-is-empty: "このフォルダは空です"
-  prompt: "何をしますか？(数字を入力してください): <1 → ファイルをアップロード | 2 → ファイルをURLでアップロード | 3 → フォルダ作成 | 4 → このフォルダ名を変更 | 5 → このフォルダを移動 | 6 → このフォルダを削除>"
-  deletion-alert: "ごめんなさい！フォルダの削除は未実装です...。"
   folder-name: "フォルダー名"
   here-is-root: "現在いる場所はルートで、フォルダではありません。"
   url-prompt: "アップロードしたいファイルのURL"
   uploading: "アップロードをリクエストしました。アップロードが完了するまで時間がかかる場合があります。"
+  folder-name-cannot-empty: "フォルダ名を空白にすることはできません。"
 
 mobile/views/components/drive-file-chooser.vue:
   select-file: "ファイルを選択"
@@ -1625,7 +1655,7 @@ mobile/views/components/post-form.vue:
   quote-placeholder: "この投稿を引用... (オプション)"
   reply-placeholder: "この投稿への返信..."
   cw-placeholder: "内容への注釈 (オプション)"
-  location-alert: "お使いの端末は位置情報に対応していません"
+  geolocation-alert: "お使いの端末は位置情報に対応していません"
   error: "エラー"
   username-prompt: "ユーザー名を入力してください"
 
@@ -1650,9 +1680,17 @@ mobile/views/components/ui.nav.vue:
   admin: "管理"
   about: "Misskeyについて"
 
+mobile/views/pages/drive.vue:
+  contextmenu:
+    upload: "ファイルをアップロード"
+    url-upload: "ファイルをURLでアップロード"
+    create-folder: "フォルダーを作成"
+    rename-folder: "フォルダー名を変更"
+    move-folder: "このフォルダを移動"
+    delete-folder: "このフォルダを削除"
+
 mobile/views/pages/user-lists.vue:
   title: "リスト"
-  enter-list-name: "リスト名を入力してください"
 
 mobile/views/pages/signup.vue:
   lets-start: "📦 始めましょう"
@@ -1804,14 +1842,17 @@ dev/views/apps.vue:
   app-missing: "アプリなし"
 
 dev/views/new-app.vue:
+  new-app: "新しいアプリケーション"
+  new-app-info: "アプリケーションはAPIからでも作成できます。 (app/create)"
   create-app: "アプリケーションの作成"
   app-name: "アプリケーション名"
+  app-name-placeholder: "ex) Misskey for iOS"
   app-name-desc: "あなたのアプリの名称。"
-  app-name-ex: "ex) Misskey for iOS"
   app-overview: "アプリの概要"
-  app-desc: "あなたのアプリの簡単な説明や紹介。"
+  app-overview-placeholder: " ex) Misskey iOSクライアント。"
-  app-desc-ex: "ex) Misskey iOSクライアント。"
+  app-overview-desc: "あなたのアプリの簡単な説明や紹介。"
   callback-url: "コールバックURL (オプション)"
+  callback-url-placeholder: "ex) https://your.app.example.com/callback.php"
   callback-url-desc: "ユーザーが認証フォームで認証した際にリダイレクトするURLを設定できます。"
   authority: "権限"
   authority-desc: "ここで要求した機能だけがAPIからアクセスできます。"

locales/ja-KS.yml

@@ -60,6 +60,8 @@ common:
   following: "フォローしとる"
   followers: "フォロワー"
   favorites: "お気に入り"
+  permissions:
+    "write:votes": "投票するで"
   weekday-short:
     sunday: "日"
     monday: "月"
@@ -1126,7 +1128,7 @@ mobile/views/components/post-form.vue:
   quote-placeholder: "この投稿を持ってくる(オプション)"
   reply-placeholder: "この投稿への返信..."
   cw-placeholder: "内容への注釈 (オプション)"
-  location-alert: "あんさんのつことる端末は位置情報に対応しとらんみたいやわ、知らんけど。"
+  geolocation-alert: "あんさんのつことる端末は位置情報に対応しとらんみたいやわ、知らんけど。"
   error: "エラー"
   username-prompt: "ユーザー名を入力してや"
 mobile/views/components/sub-note-content.vue:
@@ -1272,10 +1274,7 @@ dev/views/new-app.vue:
   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: "権限"

locales/ko-KR.yml

@@ -70,10 +70,11 @@ common:
   followers: "팔로워"
   favorites: "즐겨찾기"
   permissions:
-    'read:account': "계정 정보 보기"
+    "read:account": "계정 정보 보기"
-    'write:account': "계정 정보 변경"
+    "write:account": "계정 정보 변경"
-    'read:drive': "드라이브 보기"
+    "read:drive": "드라이브 보기"
-    'write:drive': "드라이브 수정"
+    "write:drive": "드라이브 수정"
+    "write:votes": "투표하기"
   empty-timeline-info:
     follow-users-to-make-your-timeline: "사용자를 팔로우하면 글이 타임라인에 표시됩니다."
     explore: "사용자 탐색"
@@ -281,6 +282,7 @@ common:
     nav: "내비게이션"
     tips: "팁"
     hashtags: "해시태그"
+    queue: "큐"
   dev: "앱을 만드는 데 실패했습니다. 다시 시도하시기 바랍니다."
   ai-chan-kawaii: "아이쨩 귀여워"
   you: "당신"
@@ -966,6 +968,7 @@ common/views/components/password-settings.vue:
   changed: "비밀번호를 변경하였습니다"
   failed: "비밀번호 변경을 실패하였습니다."
 common/views/components/post-form-attaches.vue:
+  attach-cancel: "첨부 취소"
   mark-as-sensitive: "열람주의로 설정"
   unmark-as-sensitive: "열람주의 해제"
 desktop/views/components/sub-note-content.vue:
@@ -1461,7 +1464,7 @@ mobile/views/components/post-form.vue:
   quote-placeholder: "이 글을 인용... (선택적)"
   reply-placeholder: "이 글에 답글..."
   cw-placeholder: "내용 주석 (선택적)"
-  location-alert: "사용하시는 장치가 위치정보 기능에 대응하지 않습니다"
+  geolocation-alert: "사용하시는 장치가 위치정보 기능에 대응하지 않습니다"
   error: "오류"
   username-prompt: "사용자명을 입력하여 주십시오"
 mobile/views/components/sub-note-content.vue:
@@ -1614,10 +1617,7 @@ 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을 설정합니다."
   authority: "권한"

locales/nl-NL.yml

@@ -23,6 +23,8 @@ common:
   timeline: "Tijdlijn"
   followers: "Volgers"
   favorites: "Deze notitie toevoegen aan favorieten"
+  permissions:
+    "write:votes": "Stemmen"
   weekday-short:
     sunday: "Z"
     monday: "M"

locales/no-NO.yml

@@ -37,6 +37,8 @@ common:
   home: "Hjem"
   followers: "Følgere"
   favorites: "Merket som favoritt"
+  permissions:
+    "write:votes": "Stem"
   weekday-short:
     sunday: "S"
     monday: "M"

locales/pl-PL.yml

@@ -63,7 +63,8 @@ common:
   followers: "Śledzący"
   favorites: "Moje ulubione"
   permissions:
-    'read:drive': "Wyświetl dysk"
+    "read:drive": "Wyświetl dysk"
+    "write:votes": "Zagłosuj"
   empty-timeline-info:
     explore: "Poznaj"
   weekday-short:
@@ -1082,7 +1083,7 @@ mobile/views/components/post-form.vue:
   quote-placeholder: "Zacytuj ten wpis… (nieobowiązkowe)"
   reply-placeholder: "Odpowiedź na ten wpis…"
   cw-placeholder: "Treść ostrzeżenia (opcjonalnie)"
-  location-alert: "Twoje urządzenie nie pozwala na przekazywanie informacji o lokalizacji"
+  geolocation-alert: "Twoje urządzenie nie obsługuje geolokalizacji."
   error: "Błąd"
   username-prompt: "Wprowadź nazwę użytkownika"
 mobile/views/components/sub-note-content.vue:

locales/zh-CN.yml

@@ -70,10 +70,26 @@ common:
   followers: "关注者"
   favorites: "最爱"
   permissions:
-    'read:account': "查看账户信息"
+    "read:account": "查看账户信息"
-    'write:account': "更改我的帐户信息"
+    "write:account": "更改我的帐户信息"
-    'read:drive': "查看网盘"
+    "read:blocks": "查看黑名单"
-    'write:drive': "管理网盘文件"
+    "write:blocks": "编辑黑名单"
+    "read:drive": "查看网盘"
+    "write:drive": "管理网盘文件"
+    "read:favorites": "查看收藏夹"
+    "write:favorites": "编辑收藏夹"
+    "read:following": "查看关注信息"
+    "write:following": "关注/取消关注"
+    "read:messaging": "查看对话"
+    "write:messaging": "对话操作"
+    "read:mutes": "查看屏蔽列表"
+    "write:mutes": "编辑屏蔽列表"
+    "write:notes": "创建或删除帖子"
+    "read:notifications": "查看通知"
+    "write:notifications": "管理通知"
+    "read:reactions": "查看回应"
+    "write:reactions": "回应操作"
+    "write:votes": "投票"
   empty-timeline-info:
     follow-users-to-make-your-timeline: "关注其他用户时，帖子将显示在时间线中。"
     explore: "查找用户"
@@ -129,7 +145,7 @@ common:
     apps: "应用程序"
     tags: "标签"
     mute-and-block: "屏蔽/拉黑"
-    blocking: "屏蔽"
+    blocking: "拉黑"
     security: "安全性"
     signin: "登录历史"
     password: "密码"
@@ -281,6 +297,7 @@ common:
     nav: "导航"
     tips: "提示"
     hashtags: "标签"
+    queue: "队列"
   dev: "构建应用程序失败，请再试一次。"
   ai-chan-kawaii: "小蓝真可爱"
   you: "您"
@@ -966,6 +983,7 @@ common/views/components/password-settings.vue:
   changed: "密码已更改"
   failed: "更改密码失败"
 common/views/components/post-form-attaches.vue:
+  attach-cancel: "删除附件"
   mark-as-sensitive: "标记为“敏感”"
   unmark-as-sensitive: "取消标记为“敏感”"
 desktop/views/components/sub-note-content.vue:
@@ -1385,6 +1403,7 @@ desktop/views/widgets/polls.vue:
 desktop/views/widgets/post-form.vue:
   title: "帖子"
   note: "帖子"
+  something-happened: "由于某种原因无法发帖。"
 desktop/views/widgets/profile.vue:
   update-banner: "点击来剪辑背景"
   update-avatar: "点击来剪辑头像"
@@ -1461,7 +1480,7 @@ mobile/views/components/post-form.vue:
   quote-placeholder: "引用这个帖子t... (可选)"
   reply-placeholder: "回复这个帖子"
   cw-placeholder: "评论帖子（可选）"
-  location-alert: "您的设备不提供定位服务"
+  geolocation-alert: "您的设备不提供位置服务"
   error: "错误"
   username-prompt: "请输入用户名"
 mobile/views/components/sub-note-content.vue:
@@ -1611,14 +1630,17 @@ dev/views/apps.vue:
   create-app: "创建应用"
   app-missing: "没有应用"
 dev/views/new-app.vue:
+  new-app: "新应用"
+  new-app-info: "可以从 API 中创建应用。 (app/create)"
   create-app: "正在创建应用"
   app-name: "应用名称"
+  app-name-placeholder: "ex) iOS版Misskey"
   app-name-desc: "您应用的名称"
-  app-name-ex: "ex) iOS版本的Misskey"
   app-overview: "应用摘要"
-  app-desc: "您的应用的简要说明或介绍。"
+  app-overview-placeholder: " ex) iOS版Misskey客户端."
-  app-desc-ex: "ex) iOS版Misskey客户端."
+  app-overview-desc: "您的应用的简要说明或介绍。"
   callback-url: "回应URL (optional)"
+  callback-url-placeholder: "ex) https://your.app.example.com/callback.php"
   callback-url-desc: "通过身份验证表单对用户进行身份验证后重定向到的URL。"
   authority: "权限"
   authority-desc: "只能通过API访问此处请求的功能。"

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.0.1",
+	"version": "11.2.0",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",
@@ -64,8 +64,6 @@
 		"@types/lolex": "3.1.1",
 		"@types/minio": "7.0.1",
 		"@types/mocha": "5.2.6",
-		"@types/mongodb": "3.1.22",
-		"@types/monk": "6.0.0",
 		"@types/node": "11.13.4",
 		"@types/nodemailer": "4.6.7",
 		"@types/nprogress": "0.0.29",
@@ -75,6 +73,7 @@
 		"@types/portscanner": "2.1.0",
 		"@types/pug": "2.0.4",
 		"@types/qrcode": "1.3.2",
+		"@types/random-seed": "0.3.3",
 		"@types/ratelimiter": "2.1.28",
 		"@types/redis": "2.8.12",
 		"@types/rename": "1.0.1",
@@ -166,8 +165,6 @@
 		"mocha": "6.1.3",
 		"moji": "0.5.1",
 		"moment": "2.24.0",
-		"mongodb": "3.2.3",
-		"monk": "6.0.6",
 		"ms": "2.1.1",
 		"nested-property": "0.0.7",
 		"node-fetch": "2.3.0",
@@ -187,7 +184,9 @@
 		"promise-sequential": "1.1.1",
 		"pug": "2.0.3",
 		"punycode": "2.1.1",
+		"pureimage": "0.1.6",
 		"qrcode": "1.3.3",
+		"random-seed": "0.3.0",
 		"randomcolor": "0.5.4",
 		"ratelimiter": "3.3.0",
 		"recaptcha-promise": "0.1.3",

src/client/app/admin/views/drive.vue

@@ -242,7 +242,7 @@ export default Vue.extend({
 
 		> div:nth-child(1)
 			> .thumbnail
-				display block
+				display flex
 				width 64px
 				height 64px
 				background-size cover

src/client/app/admin/views/instance.vue

@@ -195,7 +195,7 @@ export default Vue.extend({
 	},
 
 	created() {
-		this.$root.getMeta().then(meta => {
+		this.$root.getMeta(true).then(meta => {
 			this.maintainerName = meta.maintainerName;
 			this.maintainerEmail = meta.maintainerEmail;
 			this.disableRegistration = meta.disableRegistration;

src/client/app/admin/views/users.vue

@@ -232,6 +232,8 @@ export default Vue.extend({
 		},
 
 		async silenceUser() {
+			if (!await this.getConfirmed(this.$t('silence-confirm'))) return;
+
 			const process = async () => {
 				await this.$root.api('admin/silence-user', { userId: this.user.id });
 				this.$root.dialog({
@@ -251,6 +253,8 @@ export default Vue.extend({
 		},
 
 		async unsilenceUser() {
+			if (!await this.getConfirmed(this.$t('unsilence-confirm'))) return;
+
 			const process = async () => {
 				await this.$root.api('admin/unsilence-user', { userId: this.user.id });
 				this.$root.dialog({

src/client/app/common/scripts/note-mixin.ts

@@ -134,7 +134,7 @@ export default (opts: Opts = {}) => ({
 		},
 
 		reactDirectly(reaction) {
-			(this.$root.api('notes/reactions/create', {
+			this.$root.api('notes/reactions/create', {
 				noteId: this.appearNote.id,
 				reaction: reaction
 			});

src/client/app/common/scripts/note-subscriber.ts

@@ -137,7 +137,6 @@ export default prop => ({
 					Vue.set(this.$_ns_target, 'deletedAt', body.deletedAt);
 					Vue.set(this.$_ns_target, 'renote', null);
 					this.$_ns_target.text = null;
-					this.$_ns_target.tags = [];
 					this.$_ns_target.fileIds = [];
 					this.$_ns_target.poll = null;
 					this.$_ns_target.geo = null;

src/client/app/common/scripts/search.ts

@@ -0,0 +1,64 @@
+import { faHistory } from '@fortawesome/free-solid-svg-icons';
+
+export async function search(v: any, q: string) {
+	q = q.trim();
+
+	if (q.startsWith('@')) {
+		v.$router.push(`/${q}`);
+		return;
+	}
+
+	if (q.startsWith('#')) {
+		v.$router.push(`/tags/${encodeURIComponent(q.substr(1))}`);
+		return;
+	}
+
+	// like 2018/03/12
+	if (/^[0-9]{4}\/[0-9]{2}\/[0-9]{2}/.test(q.replace(/-/g, '/'))) {
+		const date = new Date(q.replace(/-/g, '/'));
+
+		// 日付しか指定されてない場合、例えば 2018/03/12 ならユーザーは
+		// 2018/03/12 のコンテンツを「含む」結果になることを期待するはずなので
+		// 23時間59分進める(そのままだと 2018/03/12 00:00:00 「まで」の
+		// 結果になってしまい、2018/03/12 のコンテンツは含まれない)
+		if (q.replace(/-/g, '/').match(/^[0-9]{4}\/[0-9]{2}\/[0-9]{2}$/)) {
+			date.setHours(23, 59, 59, 999);
+		}
+
+		v.$root.$emit('warp', date);
+		v.$root.dialog({
+			icon: faHistory,
+			splash: true,
+		});
+		return;
+	}
+
+	if (q.startsWith('https://')) {
+		const dialog = v.$root.dialog({
+			type: 'waiting',
+			text: v.$t('@.fetching-as-ap-object'),
+			showOkButton: false,
+			showCancelButton: false,
+			cancelableByBgClick: false
+		});
+
+		try {
+			const res = await v.$root.api('ap/show', {
+				uri: q
+			});
+			dialog.close();
+			if (res.type == 'User') {
+				v.$router.push(`/@${res.object.username}@${res.object.host}`);
+			} else if (res.type == 'Note') {
+				v.$router.push(`/notes/${res.object.id}`);
+			}
+		} catch (e) {
+			dialog.close();
+			// TODO: Show error
+		}
+
+		return;
+	}
+
+	v.$router.push(`/search?q=${encodeURIComponent(q)}`);
+}

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

@@ -6,7 +6,17 @@
 			<mk-signin/>
 		</template>
 		<template v-else>
-			<div class="icon" v-if="!input && !select && !user" :class="type"><fa :icon="icon"/></div>
+			<div class="icon" v-if="icon">
+				<fa :icon="icon"/>
+			</div>
+			<div class="icon" v-else-if="!input && !select && !user" :class="type">
+				<fa icon="check" v-if="type === 'success'"/>
+				<fa :icon="faTimesCircle" v-if="type === 'error'"/>
+				<fa icon="exclamation-triangle" v-if="type === 'warning'"/>
+				<fa icon="info-circle" v-if="type === 'info'"/>
+				<fa :icon="faQuestionCircle" v-if="type === 'question'"/>
+				<fa icon="spinner" pulse v-if="type === 'waiting'"/>
+			</div>
 			<header v-if="title" v-html="title"></header>
 			<div class="body" v-if="text" v-html="text"></div>
 			<ui-input v-if="input" v-model="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder" @keydown="onInputKeydown"></ui-input>
@@ -14,8 +24,8 @@
 			<ui-select v-if="select" v-model="selectedValue" autofocus>
 				<option v-for="item in select.items" :value="item.value">{{ item.text }}</option>
 			</ui-select>
-			<ui-horizon-group no-grow class="buttons fit-bottom" v-if="!splash">
+			<ui-horizon-group no-grow class="buttons fit-bottom" v-if="!splash && (showOkButton || showCancelButton)">
-				<ui-button @click="ok" primary :autofocus="!input && !select && !user">{{ (showCancelButton || input || select || user) ? $t('@.ok') : $t('@.got-it') }}</ui-button>
+				<ui-button @click="ok" v-if="showOkButton" primary :autofocus="!input && !select && !user">{{ (showCancelButton || input || select || user) ? $t('@.ok') : $t('@.got-it') }}</ui-button>
 				<ui-button @click="cancel" v-if="showCancelButton || input || select || user">{{ $t('@.cancel') }}</ui-button>
 			</ui-horizon-group>
 		</template>
@@ -55,10 +65,21 @@ export default Vue.extend({
 		user: {
 			required: false
 		},
+		icon: {
+			required: false
+		},
+		showOkButton: {
+			type: Boolean,
+			default: true
+		},
 		showCancelButton: {
 			type: Boolean,
 			default: false
 		},
+		cancelableByBgClick: {
+			type: Boolean,
+			default: true
+		},
 		splash: {
 			type: Boolean,
 			default: false
@@ -69,22 +90,11 @@ export default Vue.extend({
 		return {
 			inputValue: this.input && this.input.default ? this.input.default : null,
 			userInputValue: null,
-			selectedValue: null
+			selectedValue: null,
+			faTimesCircle, faQuestionCircle
 		};
 	},
 
-	computed: {
-		icon(): any {
-			switch (this.type) {
-				case 'success': return 'check';
-				case 'error': return faTimesCircle;
-				case 'warning': return 'exclamation-triangle';
-				case 'info': return 'info-circle';
-				case 'question': return faQuestionCircle;
-			}
-		}
-	},
-
 	mounted() {
 		this.$nextTick(() => {
 			(this.$refs.bg as any).style.pointerEvents = 'auto';
@@ -113,6 +123,8 @@ export default Vue.extend({
 
 	methods: {
 		async ok() {
+			if (!this.showOkButton) return;
+
 			if (this.user) {
 				const user = await this.$root.api('users/show', parseAcct(this.userInputValue));
 				if (user) {
@@ -156,7 +168,9 @@ export default Vue.extend({
 		},
 
 		onBgClick() {
-			this.cancel();
+			if (this.cancelableByBgClick) {
+				this.cancel();
+			}
 		},
 
 		onInputKeydown(e) {
@@ -183,9 +197,6 @@ export default Vue.extend({
 	height 100%
 
 	&.splash
-		&, *
-			pointer-events none !important
-
 		> .main
 			min-width 0
 			width initial
@@ -243,7 +254,7 @@ export default Vue.extend({
 				margin-top 8px
 
 		> .body
-			margin 16px 0
+			margin 16px 0 0 0
 
 		> .buttons
 			margin-top 16px

src/client/app/common/views/components/drive-file-thumbnail.vue

@@ -121,7 +121,7 @@ export default Vue.extend({
 			if (this.file.properties.avgColor) {
 				anime({
 					targets: this.$refs.thumbnail,
-					backgroundColor: this.file.properties.avgColor.replace('255)', '0)'),
+					backgroundColor: 'transparent', // TODO fade
 					duration: 100,
 					easing: 'linear'
 				});

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

@@ -36,7 +36,9 @@ export default Vue.extend({
 			return this.host === localHost ? `@${this.username}` : `@${this.username}@${toUnicode(this.host)}`;
 		},
 		isMe(): boolean {
-			return this.$store.getters.isSignedIn && this.canonical.toLowerCase() === `@${this.$store.state.i.username}@${toUnicode(localHost)}`.toLowerCase();
+			return this.$store.getters.isSignedIn && (
+				`@${this.username}@${toUnicode(this.host)}` === `@${this.$store.state.i.username}@${toUnicode(localHost)}`.toLowerCase()
+			);
 		}
 	},
 	methods: {

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

@@ -85,7 +85,10 @@ export default Vue.extend({
 				}
 			} else {
 				if (items[0].kind == 'file') {
-					alert(this.$t('only-one-file-attached'));
+					this.$root.dialog({
+						type: 'error',
+						text: this.$t('only-one-file-attached')
+					});
 				}
 			}
 		},
@@ -107,7 +110,10 @@ export default Vue.extend({
 				return;
 			} else if (e.dataTransfer.files.length > 1) {
 				e.preventDefault();
-				alert(this.$t('only-one-file-attached'));
+				this.$root.dialog({
+					type: 'error',
+					text: this.$t('only-one-file-attached')
+				});
 				return;
 			}
 

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

@@ -6,7 +6,7 @@
 	<div class="body">
 		<p class="init" v-if="init"><fa icon="spinner .spin"/>{{ $t('@.loading') }}</p>
 		<p class="empty" v-if="!init && messages.length == 0"><fa icon="info-circle"/>{{ $t('empty') }}</p>
-		<p class="no-history" v-if="!init && messages.length > 0 && !existMoreMessages"><fa icon="flag"/>{{ $t('no-history') }}</p>
+		<p class="no-history" v-if="!init && messages.length > 0 && !existMoreMessages"><fa :icon="faFlag"/>{{ $t('no-history') }}</p>
 		<button class="more" :class="{ fetching: fetchingMoreMessages }" v-if="existMoreMessages" @click="fetchMoreMessages" :disabled="fetchingMoreMessages">
 			<template v-if="fetchingMoreMessages"><fa icon="spinner" pulse fixed-width/></template>{{ fetchingMoreMessages ? $t('@.loading') : $t('@.load-more') }}
 		</button>
@@ -35,6 +35,7 @@ import XMessage from './messaging-room.message.vue';
 import XForm from './messaging-room.form.vue';
 import { url } from '../../../config';
 import { faArrowCircleDown } from '@fortawesome/free-solid-svg-icons';
+import { faFlag } from '@fortawesome/free-regular-svg-icons';
 
 export default Vue.extend({
 	i18n: i18n('common/views/components/messaging-room.vue'),
@@ -54,7 +55,7 @@ export default Vue.extend({
 			connection: null,
 			showIndicator: false,
 			timer: null,
-			faArrowCircleDown
+			faArrowCircleDown, faFlag
 		};
 	},
 
@@ -125,7 +126,10 @@ export default Vue.extend({
 				this.form.upload(e.dataTransfer.files[0]);
 				return;
 			} else if (e.dataTransfer.files.length > 1) {
-				alert(this.$t('only-one-file-attached'));
+				this.$root.dialog({
+					type: 'error',
+					text: this.$t('only-one-file-attached')
+				});
 				return;
 			}
 

src/client/app/common/views/components/post-form-attaches.vue

@@ -1,6 +1,6 @@
 <template>
 <div class="skeikyzd" v-show="files.length != 0">
-	<x-draggable class="files" :list="files" :options="{ animation: 150 }">
+	<x-draggable class="files" :list="files" animation="150">
 		<div v-for="file in files" :key="file.id" @click="showFileMenu(file, $event)" @contextmenu.prevent="showFileMenu(file, $event)">
 			<x-file-thumbnail :data-id="file.id" class="thumbnail" :file="file" fit="cover"/>
 			<img class="remove" @click.stop="detachMedia(file.id)" src="/assets/desktop/remove.png" :title="$t('attach-cancel')" alt=""/>
@@ -32,7 +32,7 @@ export default Vue.extend({
 
 	props: {
 		files: {
-			type: Object,
+			type: Array,
 			required: true
 		},
 		detachMediaFn: {

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

@@ -14,7 +14,7 @@
 
 	<section>
 		<header><fa icon="terminal"/> {{ $t('console.title') }}</header>
-		<ui-input v-model="endpoint">
+		<ui-input v-model="endpoint" :datalist="endpoints">
 			<span>{{ $t('console.endpoint') }}</span>
 		</ui-input>
 		<ui-textarea v-model="body">
@@ -39,15 +39,23 @@ import * as JSON5 from 'json5';
 
 export default Vue.extend({
 	i18n: i18n('common/views/components/api-settings.vue'),
+
 	data() {
 		return {
 			endpoint: '',
 			body: '{}',
 			res: null,
-			sending: false
+			sending: false,
+			endpoints: []
 		};
 	},
 
+	created() {
+		this.$root.api('endpoints').then(endpoints => {
+			this.endpoints = endpoints;
+		});
+	},
+
 	methods: {
 		regenerateToken() {
 			this.$root.dialog({

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

@@ -84,7 +84,7 @@
 				<ui-info v-else warn>{{ $t('email-not-verified') }}</ui-info>
 			</template>
 			<ui-input v-model="email" type="email"><span>{{ $t('email-address') }}</span></ui-input>
-			<ui-button @click="updateEmail()"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
+			<ui-button @click="updateEmail()" :disabled="email === $store.state.i.email"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
 		</div>
 	</section>
 

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

@@ -525,15 +525,11 @@ export default Vue.extend({
 			this.$chooseDriveFile({
 				multiple: false
 			}).then(file => {
-				this.$root.api('i/update', {
+				this.$store.dispatch('settings/set', { key: 'wallpaper', value: file.url });
-					wallpaperId: file.id
-				});
 			});
 		},
 		deleteWallpaper() {
-			this.$root.api('i/update', {
+			this.$store.dispatch('settings/set', { key: 'wallpaper', value: null });
-				wallpaperId: null
-			});
 		},
 		checkForUpdate() {
 			this.checkingForUpdate = true;
@@ -542,8 +538,8 @@ export default Vue.extend({
 				this.latestVersion = newer;
 				if (newer == null) {
 					this.$root.dialog({
-						title: this.$t('no-updates'),
+						title: this.$t('@._settings.no-updates'),
-						text: this.$t('no-updates-desc')
+						text: this.$t('@._settings.no-updates-desc')
 					});
 				} else {
 					this.$root.dialog({

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

@@ -79,7 +79,10 @@ export default Vue.extend({
 				localStorage.setItem('i', res.i);
 				location.reload();
 			}).catch(() => {
-				alert(this.$t('login-failed'));
+				this.$root.dialog({
+					type: 'error',
+					text: this.$t('login-failed')
+				});
 				this.signing = false;
 			});
 		}

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

@@ -153,7 +153,10 @@ export default Vue.extend({
 					location.href = '/';
 				});
 			}).catch(() => {
-				alert(this.$t('some-error'));
+				this.$root.dialog({
+					type: 'error',
+					text: this.$t('some-error')
+				});
 
 				if (this.meta.enableRecaptcha) {
 					(window as any).grecaptcha.reset();

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

@@ -23,6 +23,7 @@
 				@focus="focused = true"
 				@blur="focused = false"
 				@keydown="$emit('keydown', $event)"
+				:list="id"
 			>
 			<input v-else ref="input"
 				:type="type"
@@ -37,7 +38,11 @@
 				@focus="focused = true"
 				@blur="focused = false"
 				@keydown="$emit('keydown', $event)"
+				:list="id"
 			>
+			<datalist :id="id" v-if="datalist">
+				<option v-for="data in datalist" :value="data"/>
+			</datalist>
 		</template>
 		<template v-else>
 			<input ref="input"
@@ -130,6 +135,10 @@ export default Vue.extend({
 			required: false,
 			default: false
 		},
+		datalist: {
+			type: Array,
+			required: false,
+		},
 		inline: {
 			type: Boolean,
 			required: false,
@@ -147,7 +156,8 @@ export default Vue.extend({
 		return {
 			v: this.value,
 			focused: false,
-			passwordStrength: ''
+			passwordStrength: '',
+			id: Math.random().toString()
 		};
 	},
 	computed: {

src/client/app/common/views/components/user-lists.vue

@@ -0,0 +1,95 @@
+<template>
+<div class="xkxvokkjlptzyewouewmceqcxhpgzprp">
+	<button class="ui" @click="add">{{ $t('create-list') }}</button>
+	<a v-for="list in lists" :key="list.id" @click="choice(list)">{{ list.name }}</a>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../i18n';
+
+export default Vue.extend({
+	i18n: i18n('common/views/components/user-lists.vue'),
+	data() {
+		return {
+			fetching: true,
+			lists: []
+		};
+	},
+	mounted() {
+		this.$root.api('users/lists/list').then(lists => {
+			this.fetching = false;
+			this.lists = lists;
+		});
+	},
+	methods: {
+		add() {
+			this.$root.dialog({
+				title: this.$t('list-name'),
+				input: true
+			}).then(async ({ canceled, result: title }) => {
+				if (canceled) return;
+				const list = await this.$root.api('users/lists/create', {
+					title
+				});
+
+				this.lists.push(list)
+				this.$emit('choosen', list);
+			});
+		},
+		choice(list) {
+			this.$emit('choosen', list);
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.xkxvokkjlptzyewouewmceqcxhpgzprp
+	padding 16px
+	background: var(--bg)
+
+	> button
+		display block
+		margin-bottom 16px
+		color var(--primaryForeground)
+		background var(--primary)
+		width 100%
+		border-radius 38px
+		user-select none
+		cursor pointer
+		padding 0 16px
+		min-width 100px
+		line-height 38px
+		font-size 14px
+		font-weight 700
+
+		&:hover
+			background var(--primaryLighten10)
+
+		&:active
+			background var(--primaryDarken10)
+
+	a
+		display block
+		margin 8px 0
+		padding 8px
+		color var(--text)
+		background var(--face)
+		box-shadow 0 2px 16px var(--reversiListItemShadow)
+		border-radius 6px
+		cursor pointer
+		line-height 32px
+
+		*
+			pointer-events none
+			user-select none
+
+		&:hover
+			box-shadow 0 0 0 100px inset rgba(0, 0, 0, 0.05)
+
+		&:active
+			box-shadow 0 0 0 100px inset rgba(0, 0, 0, 0.1)
+
+</style>

src/client/app/common/views/components/user-menu.vue

@@ -89,8 +89,10 @@ export default Vue.extend({
 			});
 		},
 
-		toggleMute() {
+		async toggleMute() {
 			if (this.user.isMuted) {
+				if (!await this.getConfirmed(this.$t('unmute-confirm'))) return;
+
 				this.$root.api('mute/delete', {
 					userId: this.user.id
 				}).then(() => {
@@ -102,6 +104,8 @@ export default Vue.extend({
 					});
 				});
 			} else {
+				if (!await this.getConfirmed(this.$t('mute-confirm'))) return;
+
 				this.$root.api('mute/create', {
 					userId: this.user.id
 				}).then(() => {
@@ -115,8 +119,10 @@ export default Vue.extend({
 			}
 		},
 
-		toggleBlock() {
+		async toggleBlock() {
 			if (this.user.isBlocking) {
+				if (!await this.getConfirmed(this.$t('unblock-confirm'))) return;
+
 				this.$root.api('blocking/delete', {
 					userId: this.user.id
 				}).then(() => {
@@ -128,6 +134,8 @@ export default Vue.extend({
 					});
 				});
 			} else {
+				if (!await this.getConfirmed(this.$t('block-confirm'))) return;
+
 				this.$root.api('blocking/create', {
 					userId: this.user.id
 				}).then(() => {
@@ -164,7 +172,9 @@ export default Vue.extend({
 			});
 		},
 
-		toggleSilence() {
+		async toggleSilence() {
+			if (!await this.getConfirmed(this.$t(this.user.isSilenced ? 'unsilence-confirm' : 'silence-confirm'))) return;
+
 			this.$root.api(this.user.isSilenced ? 'admin/unsilence-user' : 'admin/silence-user', {
 				userId: this.user.id
 			}).then(() => {
@@ -181,7 +191,9 @@ export default Vue.extend({
 			});
 		},
 
-		toggleSuspend() {
+		async toggleSuspend() {
+			if (!await this.getConfirmed(this.$t(this.user.isSuspended ? 'unsuspend-confirm' : 'suspend-confirm'))) return;
+
 			this.$root.api(this.user.isSuspended ? 'admin/unsuspend-user' : 'admin/suspend-user', {
 				userId: this.user.id
 			}).then(() => {
@@ -196,7 +208,18 @@ export default Vue.extend({
 					text: e
 				});
 			});
-		}
+		},
+
+		async getConfirmed(text: string): Promise<Boolean> {
+			const confirm = await this.$root.dialog({
+				type: 'warning',
+				showCancelButton: true,
+				title: 'confirm',
+				text,
+			});
+
+			return !confirm.canceled;
+		},
 	}
 });
 </script>

src/client/app/common/views/deck/deck.user-column.home.vue

@@ -118,7 +118,6 @@ export default Vue.extend({
 				fileType: image,
 				excludeNsfw: !this.$store.state.device.alwaysShowNsfw,
 				limit: 9,
-				untilDate: new Date().getTime() + 1000 * 86400 * 365
 			}).then(notes => {
 				for (const note of notes) {
 					for (const file of note.files) {

src/client/app/common/views/deck/deck.widgets-column.vue

@@ -21,7 +21,7 @@
 					<option value="users">{{ $t('@.widgets.users') }}</option>
 					<option value="polls">{{ $t('@.widgets.polls') }}</option>
 					<option value="post-form">{{ $t('@.widgets.post-form') }}</option>
-					<option value="messaging">{{ $t('@.widgets.messaging') }}</option>
+					<option value="messaging">{{ $t('@.messaging') }}</option>
 					<option value="memo">{{ $t('@.widgets.memo') }}</option>
 					<option value="hashtags">{{ $t('@.widgets.hashtags') }}</option>
 					<option value="posts-monitor">{{ $t('@.widgets.posts-monitor') }}</option>
@@ -33,7 +33,7 @@
 			</header>
 			<x-draggable
 				:list="column.widgets"
-				:options="{ animation: 150 }"
+				animation="150"
 				@sort="onWidgetSort"
 			>
 				<div v-for="widget in column.widgets" class="customize-container" :key="widget.id" @contextmenu.stop.prevent="widgetFunc(widget.id)">

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

@@ -21,7 +21,7 @@
 					<fa :icon="['far', 'laugh']"/>
 				</button>
 			</div>
-			<x-post-form-attaches class="files" :files="files" :detachMediaFn="detachMedia"/>
+			<x-post-form-attaches class="files" :files="files" :detach-media-fn="detachMedia"/>
 			<input ref="file" type="file" multiple="multiple" tabindex="-1" @change="onChangeFile"/>
 			<mk-uploader ref="uploader" @uploaded="attachMedia"/>
 			<footer>
@@ -188,7 +188,10 @@ export default define({
 			}).then(data => {
 				this.clear();
 			}).catch(err => {
-				alert('Something happened');
+				this.$root.dialog({
+					type: 'error',
+					text: this.$t('something-happened')
+				});
 			}).then(() => {
 				this.posting = false;
 				this.$nextTick(() => {

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

@@ -142,7 +142,7 @@ export default Vue.extend({
 			if (this.file.properties.avgColor) {
 				anime({
 					targets: this.$refs.thumbnail,
-					backgroundColor: this.file.properties.avgColor.replace('255)', '0)'),
+					backgroundColor: 'transparent', // TODO fade
 					duration: 100,
 					easing: 'linear'
 				});

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

@@ -161,7 +161,10 @@ export default Vue.extend({
 							});
 							break;
 						default:
-							alert(this.$t('unhandled-error'));
+							this.$root.dialog({
+								type: 'error',
+								text: this.$t('unhandled-error')
+							});
 					}
 				});
 			}

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

@@ -320,7 +320,10 @@ export default Vue.extend({
 							});
 							break;
 						default:
-							alert(this.$t('unhandled-error'));
+							this.$root.dialog({
+								type: 'error',
+								text: this.$t('unhandled-error')
+							});
 					}
 				});
 			}

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

@@ -123,7 +123,7 @@ export default Vue.extend({
 		},
 
 		fetchMore() {
-			if (!this.more || this.moreFetching) return;
+			if (!this.more || this.moreFetching || this.notes.length === 0) return;
 			this.moreFetching = true;
 			this.makePromise(this.notes[this.notes.length - 1].id).then(x => {
 				this.notes = this.notes.concat(x.notes);

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

@@ -364,7 +364,10 @@ export default Vue.extend({
 
 		setGeo() {
 			if (navigator.geolocation == null) {
-				alert(this.$t('geolocation-alert'));
+				this.$root.dialog({
+					type: 'warning',
+					text: this.$t('geolocation-alert')
+				});
 				return;
 			}
 
@@ -372,7 +375,11 @@ export default Vue.extend({
 				this.geo = pos.coords;
 				this.$emit('geo-attached', this.geo);
 			}, err => {
-				alert(`%i18n:@error%: ${err.message}`);
+				this.$root.dialog({
+					type: 'error',
+					title: this.$t('error')
+					text: err.message
+				});
 			}, {
 					enableHighAccuracy: true
 				});

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

@@ -87,6 +87,5 @@ export default Vue.extend({
 		height 100%
 		flex auto
 		overflow auto
-		background var(--bg)
 
 </style>

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

@@ -90,9 +90,8 @@
 import Vue from 'vue';
 import i18n from '../../../i18n';
 import MkUserListsWindow from './user-lists-window.vue';
-import MkUserListWindow from './user-list-window.vue';
 import MkFollowRequestsWindow from './received-follow-requests-window.vue';
-import MkSettingsWindow from './settings-window.vue';
+// import MkSettingsWindow from './settings-window.vue';
 import MkDriveWindow from './drive-window.vue';
 import contains from '../../../common/scripts/contains';
 import { faHome, faColumns } from '@fortawesome/free-solid-svg-icons';
@@ -143,12 +142,7 @@ export default Vue.extend({
 		},
 		list() {
 			this.close();
-			const w = this.$root.new(MkUserListsWindow);
+			this.$root.new(MkUserListsWindow);
-			w.$once('choosen', list => {
-				this.$root.new(MkUserListWindow, {
-					list
-				});
-			});
 		},
 		followRequests() {
 			this.close();

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

@@ -9,6 +9,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
+import { search } from '../../../common/scripts/search';
 
 export default Vue.extend({
 	i18n: i18n('desktop/views/components/ui.header.search.vue'),
@@ -22,29 +23,11 @@ export default Vue.extend({
 		async onSubmit() {
 			if (this.wait) return;
 
-			const q = this.q.trim();
+			this.wait = true;
-			if (q.startsWith('@')) {
+			search(this, this.q).finally(() => {
-				this.$router.push(`/${q}`);
-			} else if (q.startsWith('#')) {
-				this.$router.push(`/tags/${encodeURIComponent(q.substr(1))}`);
-			} else if (q.startsWith('https://')) {
-				this.wait = true;
-				try {
-					const res = await this.$root.api('ap/show', {
-						uri: q
-					});
-					if (res.type == 'User') {
-						this.$router.push(`/@${res.object.username}@${res.object.host}`);
-					} else if (res.type == 'Note') {
-						this.$router.push(`/notes/${res.object.id}`);
-					}
-				} catch (e) {
-					// TODO
-				}
 				this.wait = false;
-			} else {
+				this.q = '';
-				this.$router.push(`/search?q=${encodeURIComponent(q)}`);
+			});
-			}
 		}
 	}
 });

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

@@ -148,10 +148,7 @@ export default Vue.extend({
 		},
 
 		list() {
-			const w = this.$root.new(MkUserListsWindow);
+			this.$root.new(MkUserListsWindow);
-			w.$once('choosen', list => {
-				this.$router.push(`i/lists/${ list.id }`);
-			});
 		},
 
 		followRequests() {

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

@@ -1,6 +1,6 @@
 <template>
 <div class="mk-ui" v-hotkey.global="keymap">
-	<div class="bg" v-if="$store.getters.isSignedIn && $store.state.i.wallpaperUrl" :style="style"></div>
+	<div class="bg" v-if="$store.getters.isSignedIn && $store.state.settings.wallpaper" :style="style"></div>
 	<x-header class="header" v-if="navbar == 'top'" v-show="!zenMode" ref="header"/>
 	<x-sidebar class="sidebar" v-if="navbar != 'top'" v-show="!zenMode" ref="sidebar"/>
 	<div class="content" :class="[{ sidebar: navbar != 'top', zen: zenMode }, navbar]">
@@ -33,10 +33,9 @@ export default Vue.extend({
 		},
 
 		style(): any {
-			if (!this.$store.getters.isSignedIn || this.$store.state.i.wallpaperUrl == null) return {};
+			if (!this.$store.getters.isSignedIn || this.$store.state.settings.wallpaper == null) return {};
 			return {
-				backgroundColor: this.$store.state.i.wallpaperColor && this.$store.state.i.wallpaperColor.length == 3 ? `rgb(${ this.$store.state.i.wallpaperColor.join(',') })` : null,
+				backgroundImage: `url(${ this.$store.state.settings.wallpaper })`
-				backgroundImage: `url(${ this.$store.state.i.wallpaperUrl })`
 			};
 		},
 
@@ -96,7 +95,6 @@ export default Vue.extend({
 		background-size cover
 		background-position center
 		background-attachment fixed
-		opacity 0.3
 
 	> .content.sidebar.left
 		padding-left 68px

src/client/app/desktop/views/components/user-list-timeline.vue

@@ -18,10 +18,12 @@ export default Vue.extend({
 	data() {
 		return {
 			connection: null,
+			date: null,
 			makePromise: cursor => this.$root.api('notes/user-list-timeline', {
 				listId: this.list.id,
 				limit: fetchLimit + 1,
 				untilId: cursor ? cursor : undefined,
+				untilDate: cursor ? undefined : (this.date ? this.date.getTime() : undefined),
 				includeMyRenotes: this.$store.state.settings.showMyRenotes,
 				includeRenotedMyNotes: this.$store.state.settings.showRenotedMyNotes,
 				includeLocalRenotes: this.$store.state.settings.showLocalRenotes
@@ -46,6 +48,10 @@ export default Vue.extend({
 	},
 	mounted() {
 		this.init();
+		this.$root.$on('warp', this.warp);
+		this.$once('hook:beforeDestroy', () => {
+			this.$root.$off('warp', this.warp);
+		});
 	},
 	beforeDestroy() {
 		this.connection.dispose();
@@ -68,6 +74,10 @@ export default Vue.extend({
 		},
 		onUserRemoved() {
 			(this.$refs.timeline as any).reload();
+		},
+		warp(date) {
+			this.date = date;
+			(this.$refs.timeline as any).reload();
 		}
 	}
 });

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

@@ -1,85 +1,36 @@
 <template>
 <mk-window ref="window" width="450px" height="500px" @closed="destroyDom">
 	<template #header><fa icon="list"/> {{ $t('title') }}</template>
-
+	<x-lists :class="$style.content" @choosen="choosen"/>
-	<div class="xkxvokkjlptzyewouewmceqcxhpgzprp">
-		<button class="ui" @click="add">{{ $t('create-list') }}</button>
-		<a v-for="list in lists" :key="list.id" @click="choice(list)">{{ list.name }}</a>
-	</div>
 </mk-window>
 </template>
 
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
+import MkUserListWindow from './user-list-window.vue';
 
 export default Vue.extend({
 	i18n: i18n('desktop/views/components/user-lists-window.vue'),
-	data() {
+	components: {
-		return {
+		XLists: () => import('../../../common/views/components/user-lists.vue').then(m => m.default)
-			fetching: true,
-			lists: []
-		};
-	},
-	mounted() {
-		this.$root.api('users/lists/list').then(lists => {
-			this.fetching = false;
-			this.lists = lists;
-		});
 	},
 	methods: {
-		add() {
-			this.$root.dialog({
-				title: this.$t('list-name'),
-				input: true
-			}).then(async ({ canceled, result: title }) => {
-				if (canceled) return;
-				const list = await this.$root.api('users/lists/create', {
-					title
-				});
-
-				this.$emit('choosen', list);
-			});
-		},
-		choice(list) {
-			this.$emit('choosen', list);
-		},
 		close() {
 			(this as any).$refs.window.close();
+		},
+		choosen(list) {
+			this.$root.new(MkUserListWindow, {
+				list
+			});
 		}
 	}
 });
 </script>
 
-<style lang="stylus" scoped>
+<style lang="stylus" module>
-.xkxvokkjlptzyewouewmceqcxhpgzprp
+.content
-	padding 16px
+	height 100%
-
+	overflow auto
-	> button
-		display block
-		margin-bottom 16px
-		color var(--primaryForeground)
-		background var(--primary)
-		width 100%
-		border-radius 38px
-		user-select none
-		cursor pointer
-		padding 0 16px
-		min-width 100px
-		line-height 38px
-		font-size 14px
-		font-weight 700
-
-		&:hover
-			background var(--primaryLighten10)
-
-		&:active
-			background var(--primaryDarken10)
-
-	> a
-		display block
-		padding 16px
-		border solid 1px var(--faceDivider)
-		border-radius 4px
 
 </style>

src/client/app/desktop/views/home/home.vue

@@ -34,7 +34,7 @@
 					<button @click="addWidget">{{ $t('add') }}</button>
 				</div>
 				<div class="trash">
-					<x-draggable v-model="trash" :options="{ group: 'x' }" @add="onTrash"></x-draggable>
+					<x-draggable v-model="trash" group="x" @add="onTrash"></x-draggable>
 					<p>{{ $t('@.trash') }}</p>
 				</div>
 			</div>
@@ -45,7 +45,8 @@
 					:list="widgets[place]"
 					:class="place"
 					:data-place="place"
-					:options="{ group: 'x', animation: 150 }"
+					group="x"
+					animation="150"
 					@sort="onWidgetSort"
 					:key="place"
 				>

src/client/app/desktop/views/home/timeline.core.vue

@@ -53,6 +53,12 @@ export default Vue.extend({
 	},
 
 	created() {
+		this.$root.$on('warp', this.warp);
+		this.$once('hook:beforeDestroy', () => {
+			this.$root.$off('warp', this.warp);
+			this.connection.dispose();
+		});
+
 		const prepend = note => {
 			(this.$refs.timeline as any).prepend(note);
 		};
@@ -124,13 +130,14 @@ export default Vue.extend({
 		});
 	},
 
-	beforeDestroy() {
-		this.connection.dispose();
-	},
-
 	methods: {
 		focus() {
 			(this.$refs.timeline as any).focus();
+		},
+
+		warp(date) {
+			this.date = date;
+			(this.$refs.timeline as any).reload();
 		}
 	}
 });

src/client/app/desktop/views/home/timeline.vue

@@ -88,8 +88,6 @@ export default Vue.extend({
 			} else if (this.src == 'tag') {
 				this.tagTl = this.$store.state.device.tl.arg;
 			}
-		} else if (this.$store.state.i.followingCount == 0) {
-			this.src = 'hybrid';
 		}
 	},
 

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

@@ -46,7 +46,6 @@ export default Vue.extend({
 			fileType: image,
 			excludeNsfw: !this.$store.state.device.alwaysShowNsfw,
 			limit: 9,
-			untilDate: new Date().getTime() + 1000 * 86400 * 365
 		}).then(notes => {
 			for (const note of notes) {
 				for (const file of note.files) {

src/client/app/desktop/views/home/user/user.timeline.vue

@@ -36,7 +36,8 @@ export default Vue.extend({
 				includeReplies: this.mode == 'with-replies',
 				includeMyRenotes: this.mode != 'my-posts',
 				withFiles: this.mode == 'with-media',
-				untilDate: cursor ? cursor : new Date().getTime() + 1000 * 86400 * 365
+				untilDate: cursor ? undefined : (this.date ? this.date.getTime() : undefined),
+				untilId: cursor ? cursor : undefined
 			}).then(notes => {
 				if (notes.length == fetchLimit + 1) {
 					notes.pop();
@@ -62,10 +63,11 @@ export default Vue.extend({
 
 	mounted() {
 		document.addEventListener('keydown', this.onDocumentKeydown);
-	},
+		this.$root.$on('warp', this.warp);
-
+		this.$once('hook:beforeDestroy', () => {
-	beforeDestroy() {
+			this.$root.$off('warp', this.warp);
-		document.removeEventListener('keydown', this.onDocumentKeydown);
+			document.removeEventListener('keydown', this.onDocumentKeydown);
+		});
 	},
 
 	methods: {

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

@@ -34,7 +34,7 @@ export default Vue.extend({
 			document.title = title;
 		},
 		onOpenFolder(folder) {
-			const title = folder.name + ' | %i18n:@title%';
+			const title = `${folder.name} | ${this.$t('title')}`;
 
 			// Rewrite URL
 			history.pushState(null, title, `/i/drive/folder/${folder.id}`);

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

@@ -11,7 +11,9 @@
 
 		<div class="mkw-polls--body">
 			<div class="poll" v-if="!fetching && poll != null">
-				<p v-if="poll.text"><router-link :to="poll | notePage">{{ poll.text }}</router-link></p>
+				<p v-if="poll.text"><router-link :to="poll | notePage">
+					<mfm :text="poll.text" :author="poll.user" :custom-emojis="poll.emojis"/>
+				</router-link></p>
 				<p v-if="!poll.text"><router-link :to="poll | notePage"><fa icon="link"/></router-link></p>
 				<mk-poll :note="poll"/>
 			</div>

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

@@ -14,7 +14,7 @@ export default define({
 }).extend({
 	methods: {
 		chosen(date) {
-			this.$emit('chosen', date);
+			this.$root.$emit('warp', date);
 		},
 		func() {
 			if (this.props.design == 5) {

src/client/app/dev/views/apps.vue

@@ -1,6 +1,6 @@
 <template>
 <mk-ui>
-	<b-card :header="$t('header')">
+	<b-card :header="$t('manage-apps')">
 		<b-button to="/app/new" variant="primary">{{ $t('create-app') }}</b-button>
 		<hr>
 		<div class="apps">

src/client/app/dev/views/new-app.vue

@@ -1,35 +1,22 @@
 <template>
 <mk-ui>
-	<b-card :header="$t('header')">
+	<b-card :header="$t('new-app')">
+		<b-alert show variant="info"><fa icon="info-circle"/> {{ $t('new-app-info') }}</b-alert>
 		<b-form @submit.prevent="onSubmit" autocomplete="off">
-			<b-form-group :label="$t('app-name')" :description="$t('description')">
+			<b-form-group :label="$t('app-name')" :description="$t('app-name-desc')">
-				<b-form-input v-model="name" type="text" :placeholder="$t('placeholder')" autocomplete="off" required/>
+				<b-form-input v-model="name" type="text" :placeholder="$t('app-name-placeholder')" autocomplete="off" required/>
 			</b-form-group>
-			<b-form-group :label="$t('app-overview')" :description="$t('description')">
+			<b-form-group :label="$t('app-overview')" :description="$t('app-overview-desc')">
-				<b-textarea v-model="description" :placeholder="$t('placeholder')" autocomplete="off" required></b-textarea>
+				<b-textarea v-model="description" :placeholder="$t('app-overview-placeholder')" autocomplete="off" required></b-textarea>
 			</b-form-group>
-			<b-form-group :label="$t('callback-url')" :description="$t('description')">
+			<b-form-group :label="$t('callback-url')" :description="$t('callback-url-desc')">
-				<b-input v-model="cb" type="url" placeholder="ex) https://your.app.example.com/callback.php" autocomplete="off"/>
+				<b-input v-model="cb" type="url" :placeholder="$t('callback-url-placeholder')" autocomplete="off"/>
 			</b-form-group>
-			<b-card :header="$t('header')">
+			<b-card :header="$t('authority')">
-				<b-form-group :description="$t('description')">
+				<b-form-group :description="$t('authority-desc')">
 					<b-alert show variant="warning"><fa icon="exclamation-triangle"/> {{ $t('authority-warning') }}</b-alert>
 					<b-form-checkbox-group v-model="permission" stacked>
-						<b-form-checkbox value="read:account">{{ $t('read:account') }}</b-form-checkbox>
+						<b-form-checkbox v-for="v in permissionsList" :value="v" :key="v">{{ $t(`@.permissions.${v}`) }} ({{ v }})</b-form-checkbox>
-						<b-form-checkbox value="write:account">{{ $t('write:account') }}</b-form-checkbox>
-						<b-form-checkbox value="write:notes">{{ $t('write:notes') }}</b-form-checkbox>
-						<b-form-checkbox value="read:reactions">{{ $t('read:reactions') }}</b-form-checkbox>
-						<b-form-checkbox value="write:reactions">{{ $t('write:reactions') }}</b-form-checkbox>
-						<b-form-checkbox value="read:following">{{ $t('read:following') }}</b-form-checkbox>
-						<b-form-checkbox value="write:following">{{ $t('write:following') }}</b-form-checkbox>
-						<b-form-checkbox value="read:mutes">{{ $t('read:mutes') }}</b-form-checkbox>
-						<b-form-checkbox value="write:mutes">{{ $t('write:mutes') }}</b-form-checkbox>
-						<b-form-checkbox value="read:blocks">{{ $t('read:blocks') }}</b-form-checkbox>
-						<b-form-checkbox value="write:blocks">{{ $t('write:blocks') }}</b-form-checkbox>
-						<b-form-checkbox value="read:drive">{{ $t('read:drive') }}</b-form-checkbox>
-						<b-form-checkbox value="write:drive">{{ $t('write:drive') }}</b-form-checkbox>
-						<b-form-checkbox value="read:notifications">{{ $t('read:notifications') }}</b-form-checkbox>
-						<b-form-checkbox value="write:notifications">{{ $t('write:notifications') }}</b-form-checkbox>
 					</b-form-checkbox-group>
 				</b-form-group>
 			</b-card>
@@ -43,6 +30,8 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../i18n';
+import { kinds } from '../../../../server/api/kinds';
+
 export default Vue.extend({
 	i18n: i18n('dev/views/new-app.vue'),
 	data() {
@@ -51,7 +40,8 @@ export default Vue.extend({
 			description: '',
 			cb: '',
 			nidState: null,
-			permission: []
+			permission: [],
+			permissionsList: kinds
 		};
 	},
 	methods: {

src/client/app/init.ts

@@ -458,10 +458,14 @@ export default (callback: (launch: (router: VueRouter) => [Vue, MiOS], os: MiOS)
 					},
 					dialog(opts) {
 						const vm = this.new(Dialog, opts);
-						return new Promise((res) => {
+						const p: any = new Promise((res) => {
 							vm.$once('ok', result => res({ canceled: false, result }));
 							vm.$once('cancel', () => res({ canceled: true }));
 						});
+						p.close = () => {
+							vm.close();
+						};
+						return p;
 					}
 				},
 				router,

src/client/app/mios.ts

@@ -4,7 +4,7 @@ import { EventEmitter } from 'eventemitter3';
 import * as uuid from 'uuid';
 
 import initStore from './store';
-import { apiUrl, version } from './config';
+import { apiUrl, version, locale } from './config';
 import Progress from './common/scripts/loading';
 
 import Err from './common/views/components/connect-failed.vue';
@@ -281,7 +281,7 @@ export default class MiOS extends EventEmitter {
 			// トークンが再生成されたとき
 			// このままではMisskeyが利用できないので強制的にサインアウトさせる
 			main.on('myTokenRegenerated', () => {
-				alert('%i18n:common.my-token-regenerated%');
+				alert(locale['common']['my-token-regenerated'])
 				this.signout();
 			});
 		}

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

@@ -136,7 +136,10 @@ export default Vue.extend({
 		},
 
 		showCreatedAt() {
-			alert(new Date(this.file.createdAt).toLocaleString());
+			this.$root.dialog({
+				type: 'info',
+				text: (new Date(this.file.createdAt)).toLocaleString()
+			});
 		}
 	}
 });
@@ -150,11 +153,13 @@ export default Vue.extend({
 
 		> .preview
 			width fit-content
+			width -moz-fit-content
 			max-width 100%
 			margin 0 auto
 			box-shadow 1px 1px 4px rgba(#000, 0.2)
 			overflow hidden
 			color var(--driveFileIcon)
+			justify-content center
 
 		> footer
 			padding 8px 8px 0 8px

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

@@ -379,43 +379,30 @@ export default Vue.extend({
 			});
 		},
 
-		openContextMenu() {
-			const fn = window.prompt(this.$t('prompt'));
-			if (fn == null || fn == '') return;
-			switch (fn) {
-				case '1':
-					this.selectLocalFile();
-					break;
-				case '2':
-					this.urlUpload();
-					break;
-				case '3':
-					this.createFolder();
-					break;
-				case '4':
-					this.renameFolder();
-					break;
-				case '5':
-					this.moveFolder();
-					break;
-				case '6':
-					this.deleteFolder();
-					break;
-			}
-		},
-
 		selectLocalFile() {
 			(this.$refs.file as any).click();
 		},
 
 		createFolder() {
-			const name = window.prompt(this.$t('folder-name'));
+			this.$root.dialog({
-			if (name == null || name == '') return;
+				title: this.$t('folder-name')
-			this.$root.api('drive/folders/create', {
+				input: {
-				name: name,
+					default: this.folder.name
-				parentId: this.folder ? this.folder.id : undefined
+				}
-			}).then(folder => {
+			}).then(({ result: name }) => {
-				this.addFolder(folder, true);
+				if (!name) {
+					this.$root.dialog({
+						type: 'error',
+						text: this.$t('folder-name-cannot-empty')
+					});
+					return;
+				}
+				this.$root.api('drive/folders/create', {
+					name: name,
+					parentId: this.folder ? this.folder.id : undefined
+				}).then(folder => {
+					this.addFolder(folder, true);
+				});
 			});
 		},
 
@@ -427,13 +414,25 @@ export default Vue.extend({
 				});
 				return;
 			}
-			const name = window.prompt(this.$t('folder-name'), this.folder.name);
+			this.$root.dialog({
-			if (name == null || name == '') return;
+				title: this.$t('folder-name')
-			this.$root.api('drive/folders/update', {
+				input: {
-				name: name,
+					default: this.folder.name
-				folderId: this.folder.id
+				}
-			}).then(folder => {
+			}).then(({ result: name }) => {
-				this.cd(folder);
+				if (!name) {
+					this.$root.dialog({
+						type: 'error',
+						text: this.$t('cannot-empty')
+					});
+					return;
+				}
+				this.$root.api('drive/folders/update', {
+					name: name,
+					folderId: this.folder.id
+				}).then(folder => {
+					this.cd(folder);
+				});
 			});
 		},
 

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

@@ -124,7 +124,7 @@ export default Vue.extend({
 		},
 
 		fetchMore() {
-			if (!this.more || this.moreFetching) return;
+			if (!this.more || this.moreFetching || this.notes.length === 0) return;
 			this.moreFetching = true;
 			this.makePromise(this.notes[this.notes.length - 1].id).then(x => {
 				this.notes = this.notes.concat(x.notes);

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

@@ -283,14 +283,21 @@ export default Vue.extend({
 
 		setGeo() {
 			if (navigator.geolocation == null) {
-				alert(this.$t('location-alert'));
+				this.$root.dialog({
+					type: 'warning',
+					text: this.$t('geolocation-alert')
+				});
 				return;
 			}
 
 			navigator.geolocation.getCurrentPosition(pos => {
 				this.geo = pos.coords;
 			}, err => {
-				alert(`%i18n:@error%: ${err.message}`);
+				this.$root.dialog({
+					type: 'error',
+					title: this.$t('error')
+					text: err.message
+				});
 			}, {
 					enableHighAccuracy: true
 				});

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

@@ -66,6 +66,7 @@ import i18n from '../../../i18n';
 import { lang } from '../../../config';
 import { faNewspaper, faHashtag, faHome, faColumns } from '@fortawesome/free-solid-svg-icons';
 import { faMoon, faSun } from '@fortawesome/free-regular-svg-icons';
+import { search } from '../../../common/scripts/search';
 
 export default Vue.extend({
 	i18n: i18n('mobile/views/components/ui.nav.vue'),
@@ -133,29 +134,10 @@ export default Vue.extend({
 			}).then(async ({ canceled, result: query }) => {
 				if (canceled) return;
 
-				const q = query.trim();
+				this.searching = true;
-				if (q.startsWith('@')) {
+				search(this, query).finally(() => {
-					this.$router.push(`/${q}`);
-				} else if (q.startsWith('#')) {
-					this.$router.push(`/tags/${encodeURIComponent(q.substr(1))}`);
-				} else if (q.startsWith('https://')) {
-					this.searching = true;
-					try {
-						const res = await this.$root.api('ap/show', {
-							uri: q
-						});
-						if (res.type == 'User') {
-							this.$router.push(`/@${res.object.username}@${res.object.host}`);
-						} else if (res.type == 'Note') {
-							this.$router.push(`/notes/${res.object.id}`);
-						}
-					} catch (e) {
-						// TODO
-					}
 					this.searching = false;
-				} else {
+				});
-					this.$router.push(`/search?q=${encodeURIComponent(q)}`);
-				}
 			});
 		},
 

src/client/app/mobile/views/components/user-list-timeline.vue

@@ -15,10 +15,12 @@ export default Vue.extend({
 	data() {
 		return {
 			connection: null,
+			date: null,
 			makePromise: cursor => this.$root.api('notes/user-list-timeline', {
 				listId: this.list.id,
 				limit: fetchLimit + 1,
 				untilId: cursor ? cursor : undefined,
+				untilDate: cursor ? undefined : (this.date ? this.date.getTime() : undefined),
 				includeMyRenotes: this.$store.state.settings.showMyRenotes,
 				includeRenotedMyNotes: this.$store.state.settings.showRenotedMyNotes,
 				includeLocalRenotes: this.$store.state.settings.showLocalRenotes
@@ -45,6 +47,11 @@ export default Vue.extend({
 
 	mounted() {
 		this.init();
+
+		this.$root.$on('warp', this.warp);
+		this.$once('hook:beforeDestroy', () => {
+			this.$root.$off('warp', this.warp);
+		});
 	},
 
 	beforeDestroy() {
@@ -73,6 +80,11 @@ export default Vue.extend({
 
 		onUserRemoved() {
 			(this.$refs.timeline as any).reload();
+		},
+
+		warp(date) {
+			this.date = date;
+			(this.$refs.timeline as any).reload();
 		}
 	}
 });

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

@@ -17,11 +17,13 @@ export default Vue.extend({
 
 	data() {
 		return {
+			date: null,
 			makePromise: cursor => this.$root.api('users/notes', {
 				userId: this.user.id,
 				limit: fetchLimit + 1,
 				withFiles: this.withMedia,
-				untilDate: cursor ? cursor : new Date().getTime() + 1000 * 86400 * 365
+				untilDate: cursor ? undefined : (this.date ? this.date.getTime() : undefined),
+				untilId: cursor ? cursor : undefined
 			}).then(notes => {
 				if (notes.length == fetchLimit + 1) {
 					notes.pop();
@@ -37,6 +39,20 @@ export default Vue.extend({
 				}
 			})
 		};
+	},
+
+	created() {
+		this.$root.$on('warp', this.warp);
+		this.$once('hook:beforeDestroy', () => {
+			this.$root.$off('warp', this.warp);
+		});
+	},
+
+	methods: {
+		warp(date) {
+			this.date = date;
+			(this.$refs.timeline as any).reload();
+		}
 	}
 });
 </script>

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

@@ -5,7 +5,7 @@
 		<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 icon="cloud"/></span>{{ $t('@.drive') }}</template>
 	</template>
-	<template #func><button @click="fn"><fa icon="ellipsis-h"/></button></template>
+	<template #func v-if="folder || (!folder && !file)"><button @click="openContextMenu" ref="contextSource"><fa icon="ellipsis-h"/></button></template>
 	<x-drive
 		ref="browser"
 		:init-folder="initFolder"
@@ -26,9 +26,12 @@
 import Vue from 'vue';
 import i18n from '../../../i18n';
 import Progress from '../../../common/scripts/loading';
+import XMenu from '../../../common/views/components/menu.vue';
+import { faTrashAlt } from '@fortawesome/free-regular-svg-icons';
+import { faCloudUploadAlt } from '@fortawesome/free-solid-svg-icons';
 
 export default Vue.extend({
-	i18n: i18n(),
+	i18n: i18n('mobile/views/pages/drive.vue'),
 	components: {
 		XDrive: () => import('../components/drive.vue').then(m => m.default),
 	},
@@ -63,9 +66,6 @@ export default Vue.extend({
 				(this.$refs as any).browser.goRoot(true);
 			}
 		},
-		fn() {
-			(this.$refs as any).browser.openContextMenu();
-		},
 		onMoveRoot(silent) {
 			const title = `${this.$root.instanceName} Drive`;
 
@@ -104,6 +104,42 @@ export default Vue.extend({
 
 			this.file = file;
 			this.folder = null;
+		},
+		openContextMenu() {
+			this.$root.new(XMenu, {
+				items: [{
+					type: 'item',
+					text: this.$t('contextmenu.upload'),
+					icon: 'upload',
+					action: this.$refs.browser.selectLocalFile
+				}, {
+					type: 'item',
+					text: this.$t('contextmenu.url-upload'),
+					icon: faCloudUploadAlt,
+					action: this.$refs.browser.urlUpload
+				}, {
+					type: 'item',
+					text: this.$t('contextmenu.create-folder'),
+					icon: ['far', 'folder'],
+					action: this.$refs.browser.createFolder
+				}, ...(this.folder ? [{
+					type: 'item',
+					text: this.$t('contextmenu.rename-folder'),
+					icon: 'i-cursor',
+					action: this.$refs.browser.renameFolder
+				}, {
+					type: 'item',
+					text: this.$t('contextmenu.move-folder'),
+					icon: ['far', 'folder-open'],
+					action: this.$refs.browser.moveFolder
+				}, {
+					type: 'item',
+					text: this.$t('contextmenu.delete-folder'),
+					icon: faTrashAlt,
+					action: this.$refs.browser.deleteFolder
+				}] : [])],
+				source: this.$refs.contextSource,
+			});
 		}
 	}
 });

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

@@ -32,7 +32,7 @@ export default Vue.extend({
 		this.fetch();
 	},
 	mounted() {
-		document.title = `${this.$root.instanceName} | %i18n:@notifications%`;
+		document.title = `${this.$root.instanceName} | ${this.$t('@.favorites')}`;
 	},
 	methods: {
 		fetch() {

src/client/app/mobile/views/pages/games/reversi.vue

@@ -15,7 +15,7 @@ export default Vue.extend({
 		XReversi: () => import('../../../../common/views/components/games/reversi/reversi.vue').then(m => m.default)
 	},
 	mounted() {
-		document.title = `${this.$root.instanceName} %i18n:@reversi%`;
+		document.title = `${this.$root.instanceName} | ${this.$t('reversi')}`;
 	},
 	methods: {
 		nav(game, actualNav) {

src/client/app/mobile/views/pages/home.timeline.vue

@@ -54,6 +54,12 @@ export default Vue.extend({
 	},
 
 	created() {
+		this.$root.$on('warp', this.warp);
+		this.$once('hook:beforeDestroy', () => {
+			this.$root.$off('warp', this.warp);
+			this.connection.dispose();
+		});
+
 		const prepend = note => {
 			(this.$refs.timeline as any).prepend(note);
 		};
@@ -125,10 +131,6 @@ export default Vue.extend({
 		});
 	},
 
-	beforeDestroy() {
-		this.connection.dispose();
-	},
-
 	methods: {
 		focus() {
 			(this.$refs.timeline as any).focus();

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

@@ -39,7 +39,7 @@
 					<span :data-active="src == 'messages'" @click="src = 'messages'"><fa :icon="['far', 'envelope']"/> {{ $t('messages') }}<i class="badge" v-if="$store.state.i.hasUnreadSpecifiedNotes"><fa icon="circle"/></i></span>
 					<template v-if="lists">
 						<div class="hr" v-if="lists.length > 0"></div>
-						<span v-for="l in lists" :data-active="src == 'list' && list == l" @click="src = 'list'; list = l" :key="l.id"><fa icon="list"/> {{ l.title }}</span>
+						<span v-for="l in lists" :data-active="src == 'list' && list == l" @click="src = 'list'; list = l" :key="l.id"><fa icon="list"/> {{ l.name }}</span>
 					</template>
 					<div class="hr" v-if="$store.state.settings.tagTimelines && $store.state.settings.tagTimelines.length > 0"></div>
 					<span v-for="tl in $store.state.settings.tagTimelines" :data-active="src == 'tag' && tagTl == tl" @click="src = 'tag'; tagTl = tl" :key="tl.id"><fa icon="hashtag"/> {{ tl.title }}</span>
@@ -130,8 +130,6 @@ export default Vue.extend({
 			} else if (this.src == 'tag') {
 				this.tagTl = this.$store.state.device.tl.arg;
 			}
-		} else if (this.$store.state.i.followingCount == 0) {
-			this.src = 'hybrid';
 		}
 	},
 

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

@@ -50,7 +50,7 @@ export default Vue.extend({
 		}
 	},
 	mounted() {
-		document.title = `%i18n:@search%: ${this.q} | ${this.$root.instanceName}`;
+		document.title = `${this.$t('search')}: ${this.q} | ${this.$root.instanceName}`;
 	},
 	methods: {
 		inited() {

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

@@ -1,20 +1,15 @@
 <template>
 <mk-ui>
 	<template #header><fa icon="list"/>{{ $t('title') }}</template>
-	<template #func><button @click="fn"><fa icon="plus"/></button></template>
+	<template #func><button @click="$refs.lists.add()"><fa icon="plus"/></button></template>
 
-	<main>
+	<x-lists ref="lists" @choosen="choosen"/>
-		<ul>
-			<li v-for="list in lists" :key="list.id"><router-link :to="`/i/lists/${list.id}`">{{ list.name }}</router-link></li>
-		</ul>
-	</main>
 </mk-ui>
 </template>
 
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
-import Progress from '../../../common/scripts/loading';
 
 export default Vue.extend({
 	i18n: i18n('mobile/views/pages/user-lists.vue'),
@@ -24,31 +19,16 @@ export default Vue.extend({
 			lists: []
 		};
 	},
+	components: {
+		XLists: () => import('../../../common/views/components/user-lists.vue').then(m => m.default)
+	},
 	mounted() {
 		document.title = this.$t('title');
-
-		Progress.start();
-
-		this.$root.api('users/lists/list').then(lists => {
-			this.fetching = false;
-			this.lists = lists;
-
-			Progress.done();
-		});
 	},
 	methods: {
-		fn() {
+		choosen(list) {
-			this.$root.dialog({
+			if (!list) return;
-				title: this.$t('enter-list-name'),
+			this.$router.push(`/i/lists/${list.id}`);
-				input: true
-			}).then(async ({ canceled, result: title }) => {
-				if (canceled) return;
-				const list = await this.$root.api('users/lists/create', {
-					title
-				});
-
-				this.$router.push(`/i/lists/${list.id}`);
-			});
 		}
 	}
 });

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

@@ -23,7 +23,6 @@ export default Vue.extend({
 	mounted() {
 		this.$root.api('users/notes', {
 			userId: this.user.id,
-			untilDate: new Date().getTime() + 1000 * 86400 * 365
 		}).then(notes => {
 			this.notes = notes;
 			this.fetching = false;

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

@@ -37,7 +37,6 @@ export default Vue.extend({
 			fileType: image,
 			excludeNsfw: !this.$store.state.device.alwaysShowNsfw,
 			limit: 9,
-			untilDate: new Date().getTime() + 1000 * 86400 * 365
 		}).then(notes => {
 			for (const note of notes) {
 				for (const file of note.files) {

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

@@ -29,7 +29,8 @@
 			</header>
 			<x-draggable
 				:list="widgets"
-				:options="{ handle: '.handle', animation: 150 }"
+				handle=".handle"
+				animation="150"
 				@sort="onWidgetSort"
 			>
 				<div v-for="widget in widgets" class="customize-container" :key="widget.id">
@@ -71,13 +72,13 @@ export default Vue.extend({
 
 	computed: {
 		widgets(): any[] {
-			return this.$store.state.settings.mobileHome;
+			return this.$store.state.device.mobileHome;
 		}
 	},
 
 	created() {
 		if (this.widgets.length == 0) {
-			this.widgets = [{
+			this.$store.commit('device/setMobileHome', [{
 				name: 'calendar',
 				id: 'a', data: {}
 			}, {
@@ -95,8 +96,7 @@ export default Vue.extend({
 			}, {
 				name: 'version',
 				id: 'g', data: {}
-			}];
+			}]);
-			this.saveHome();
 		}
 	},
 
@@ -106,7 +106,10 @@ export default Vue.extend({
 
 	methods: {
 		hint() {
-			alert(this.$t('widgets-hints'));
+			this.$root.dialog({
+				type: 'info',
+				text: this.$t('widgets-hints')
+			});
 		},
 
 		widgetFunc(id) {
@@ -119,7 +122,7 @@ export default Vue.extend({
 		},
 
 		addWidget() {
-			this.$store.commit('settings/addMobileHomeWidget', {
+			this.$store.commit('device/addMobileHomeWidget', {
 				name: this.widgetAdderSelected,
 				id: uuid(),
 				data: {}
@@ -127,11 +130,11 @@ export default Vue.extend({
 		},
 
 		removeWidget(widget) {
-			this.$store.commit('settings/removeMobileHomeWidget', widget);
+			this.$store.commit('device/removeMobileHomeWidget', widget);
 		},
 
 		saveHome() {
-			this.$store.commit('settings/setMobileHome', this.widgets);
+			this.$store.commit('device/setMobileHome', this.widgets);
 		}
 	}
 });

src/client/app/store.ts

@@ -28,6 +28,7 @@ const defaultSettings = {
 	iLikeSushi: false,
 	rememberNoteVisibility: false,
 	defaultNoteVisibility: 'public',
+	wallpaper: null,
 	webSearchEngine: 'https://www.google.com/?#q={{query}}',
 	mutedWords: [],
 	games: {
@@ -357,7 +358,7 @@ export default (os: MiOS) => new Vuex.Store({
 					ctx.commit('set', x);
 
 					if (ctx.rootGetters.isSignedIn) {
-						os.api('i/update_client_setting', {
+						os.api('i/update-client-setting', {
 							name: x.key,
 							value: x.value
 						});

src/client/style.styl

@@ -1,4 +1,4 @@
-@charset 'utf-8'
+@charset "utf-8"
 
 /*
 	::selection

src/db/postgre.ts

@@ -76,8 +76,6 @@ class MyCustomLogger implements Logger {
 }
 
 export function initDb(justBorrow = false, sync = false, log = false) {
-	const enableLogging = log || !['production', 'test'].includes(process.env.NODE_ENV || '');
-
 	try {
 		const conn = getConnection();
 		return Promise.resolve(conn);
@@ -92,8 +90,8 @@ export function initDb(justBorrow = false, sync = false, log = false) {
 		database: config.db.db,
 		synchronize: process.env.NODE_ENV === 'test' || sync,
 		dropSchema: process.env.NODE_ENV === 'test' && !justBorrow,
-		logging: enableLogging,
+		logging: log,
-		logger: enableLogging ? new MyCustomLogger() : undefined,
+		logger: log ? new MyCustomLogger() : undefined,
 		entities: [
 			Meta,
 			Instance,

src/docs/stream.ja-JP.md

@@ -130,10 +130,12 @@ Misskeyのストリームに接続しただけでは、まだリアルタイム
 ```json
 {
 	type: 'api',
-	id: 'xxxxxxxxxxxxxxxx',
+	body: {
-	endpoint: 'notes/create',
+		id: 'xxxxxxxxxxxxxxxx',
-	data: {
+		endpoint: 'notes/create',
-		text: 'yee haw!'
+		data: {
+			text: 'yee haw!'
+		}
 	}
 }
 ```

src/mfm/language.ts

@@ -141,7 +141,7 @@ export const mfmLanguage = P.createLanguage({
 	},
 	hashtag: () => P((input, i) => {
 		const text = input.substr(i);
-		const match = text.match(/^#([^\s\.,!\?'"#:\/\[\]]+)/i);
+		const match = text.match(/^#([^\s\.,!\?'"#:\/\[\]【】]+)/i);
 		if (!match) return P.makeFailure(i, 'not a hashtag');
 		let hashtag = match[1];
 		hashtag = removeOrphanedBrackets(hashtag);

src/misc/fetch-meta.ts

@@ -1,14 +1,21 @@
 import { Meta } from '../models/entities/meta';
-import { Metas } from '../models';
+import { getConnection } from 'typeorm';
-import { genId } from './gen-id';
 
 export default async function(): Promise<Meta> {
-	const meta = await Metas.findOne();
+	return await getConnection().transaction(async transactionalEntityManager => {
-	if (meta) {
+		// バグでレコードが複数出来てしまっている可能性があるので新しいIDを優先する
-		return meta;
+		const meta = await transactionalEntityManager.findOne(Meta, {
-	} else {
+			order: {
-		return Metas.save({
+				id: 'DESC'
-			id: genId(),
+			}
-		} as Meta);
+		});
-	}
+
+		if (meta) {
+			return meta;
+		} else {
+			return await transactionalEntityManager.save(Meta, {
+				id: 'x'
+			}) as Meta;
+		}
+	});
 }

src/misc/gen-avatar.ts

@@ -0,0 +1,90 @@
+/**
+ * Random avatar generator
+ */
+
+const p = require('pureimage');
+import * as gen from 'random-seed';
+import { WriteStream } from 'fs';
+
+const size = 256; // px
+const n = 5; // resolution
+const margin = (size / n) / 1.5;
+const colors = [
+	'#e57373',
+	'#F06292',
+	'#BA68C8',
+	'#9575CD',
+	'#7986CB',
+	'#64B5F6',
+	'#4FC3F7',
+	'#4DD0E1',
+	'#4DB6AC',
+	'#81C784',
+	'#8BC34A',
+	'#AFB42B',
+	'#F57F17',
+	'#FF5722',
+	'#795548',
+	'#455A64',
+];
+const bg = '#e9e9e9';
+
+const actualSize = size - (margin * 2);
+const cellSize = actualSize / n;
+const sideN = Math.floor(n / 2);
+
+/**
+ * Generate buffer of random avatar by seed
+ */
+export function genAvatar(seed: string, stream: WriteStream): Promise<void> {
+	const rand = gen.create(seed);
+	const canvas = p.make(size, size);
+	const ctx = canvas.getContext('2d');
+
+	ctx.fillStyle = bg;
+	ctx.beginPath();
+	ctx.fillRect(0, 0, size, size);
+
+	ctx.fillStyle = colors[rand(colors.length)];
+
+	// side bitmap (filled by false)
+	const side: boolean[][] = new Array(sideN);
+	for (let i = 0; i < side.length; i++) {
+		side[i] = new Array(n).fill(false);
+	}
+
+	// 1*n (filled by false)
+	const center: boolean[] = new Array(n).fill(false);
+
+	// tslint:disable-next-line:prefer-for-of
+	for (let x = 0; x < side.length; x++) {
+		for (let y = 0; y < side[x].length; y++) {
+			side[x][y] = rand(3) === 0;
+		}
+	}
+
+	for (let i = 0; i < center.length; i++) {
+		center[i] = rand(3) === 0;
+	}
+
+	// Draw
+	for (let x = 0; x < n; x++) {
+		for (let y = 0; y < n; y++) {
+			const isXCenter = x === ((n - 1) / 2);
+			if (isXCenter && !center[y]) continue;
+
+			const isLeftSide = x < ((n - 1) / 2);
+			if (isLeftSide && !side[x][y]) continue;
+
+			const isRightSide = x > ((n - 1) / 2);
+			if (isRightSide && !side[sideN - (x - sideN)][y]) continue;
+
+			const actualX = margin + (cellSize * x);
+			const actualY = margin + (cellSize * y);
+			ctx.beginPath();
+			ctx.fillRect(actualX, actualY, cellSize, cellSize);
+		}
+	}
+
+	return p.encodePNGToStream(canvas, stream);
+}

src/models/entities/access-token.ts

@@ -1,4 +1,4 @@
-import { Entity, PrimaryColumn, Index, Column, ManyToOne, JoinColumn, RelationId } from 'typeorm';
+import { Entity, PrimaryColumn, Index, Column, ManyToOne, JoinColumn } from 'typeorm';
 import { User } from './user';
 import { App } from './app';
 import { id } from '../id';
@@ -25,7 +25,8 @@ export class AccessToken {
 	})
 	public hash: string;
 
-	@RelationId((self: AccessToken) => self.user)
+	@Index()
+	@Column(id())
 	public userId: User['id'];
 
 	@ManyToOne(type => User, {

src/models/entities/meta.ts

@@ -1,9 +1,11 @@
 import { Entity, Column, PrimaryColumn } from 'typeorm';
-import { id } from '../id';
 
 @Entity()
 export class Meta {
-	@PrimaryColumn(id())
+	@PrimaryColumn({
+		type: 'varchar',
+		length: 32
+	})
 	public id: string;
 
 	@Column('varchar', {

src/models/entities/note.ts

@@ -93,12 +93,12 @@ export class Note {
 	})
 	public localOnly: boolean;
 
-	@Column('integer', {
+	@Column('smallint', {
 		default: 0
 	})
 	public renoteCount: number;
 
-	@Column('integer', {
+	@Column('smallint', {
 		default: 0
 	})
 	public repliesCount: number;
@@ -129,12 +129,14 @@ export class Note {
 	})
 	public score: number;
 
+	@Index()
 	@Column({
 		...id(),
 		array: true, default: '{}'
 	})
 	public fileIds: DriveFile['id'][];
 
+	@Index()
 	@Column('varchar', {
 		length: 256, array: true, default: '{}'
 	})

src/models/repositories/app.ts

@@ -25,6 +25,8 @@ export class AppRepository extends Repository<App> {
 		return {
 			id: app.id,
 			name: app.name,
+			callbackUrl: app.callbackUrl,
+			permission: app.permission,
 			...(opts.includeSecret ? { secret: app.secret } : {}),
 			...(me ? {
 				isAuthorized: await AccessTokens.count({