Merge branch 'develop'

* wip

* wip

* wip

* Update page-editor.vue

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update page-editor.variable.core.vue

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update aiscript.ts

* wip

* Update package.json

* wip

* wip

* wip

* wip

* wip

* Update page.vue

* wip

* wip

* wip

* wip

* more info

* wip fn

* wip

* wip

* wip

.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
-          executor: with-redis
+          name: manual-test
           requires:
             - manual-build
           filters:
             branches:
               ignore: master
       - test:
-          name: auto-test-without-redis
-          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
+          name: auto-test
           requires:
             - auto-build
           filters:

.config/docker_example.env

@@ -1,5 +1,4 @@
 # db settings
-POSTGRES_PASSWORD="example-misskey-pass"
-POSTGRES_USER="example-misskey-user"
-POSTGRES_DB="misskey"
-
+POSTGRES_PASSWORD=example-misskey-pass
+POSTGRES_USER=example-misskey-user
+POSTGRES_DB=misskey

.config/example.yml

@@ -132,6 +132,9 @@ drive:
 # ulid ... Millisecond accuracy
 # objectid ... This is left for backward compatibility
 
+# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
+# ID SETTINGS AFTER THAT!
+
 id: 'aid'
 
 #   ┌─────────────────────┐

.github/CODEOWNERS

@@ -1,7 +1,7 @@
 # PATH                                          OWNERS
 /.autogen/                                      @acid-chicken
 /.circleci/                                     @syuilo @acid-chicken
-/.config/                                       @syuilo @AyaMorisawa @mei23 @acid-chicken
+/.config/                                       @syuilo @AyaMorisawa @mei23 @acid-chicken @rinsuki
 # /.config/mongo_initdb_example.js              @khws4v1
 /.github/                                       @syuilo @AyaMorisawa @acid-chicken
 /.vscode/                                       @acid-chicken
@@ -12,7 +12,7 @@
 # /docs/*.fr.md                                 @BoFFire
 # /docs/docker.*.md                             @khws4v1
 /locales/                                       @syuilo
-/src/                                           @syuilo @AyaMorisawa @mei23 @acid-chicken
+/src/                                           @syuilo @AyaMorisawa @mei23 @acid-chicken @rinsuki
 # /src/crypto_key.cc                            @akihikodaki
 # /src/crypto_key.d.ts                          @akihikodaki
 /.dockerignore                                  @syuilo # @khws4v1

.gitignore

@@ -20,3 +20,4 @@ api-docs.json
 yarn.lock
 .DS_Store
 /files
+ormconfig.json

CHANGELOG.md

@@ -5,8 +5,226 @@ 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`)
 
+How to migrate to v11 from v10
+------------------------------
+### 移行の注意点
+**以下のデータは引き継がれません**
+* 通知
+* リモートの投稿
+* リバーシの対局
+
+### 手順
+1. v11をインストールしたい場所に syuilo/misskey をクローン
+2. config を設定する
+	* PostgreSQL(`db`)の設定とは別に、v10からMongoDBの設定をコピペしてくる(例は下にあります)
+	* `id`の設定を`meid`または`objectid`にする
+
+``` yml
+db:
+  host: localhost
+  port: 5432
+  db: misskey
+  user: x
+  pass: x
+
+mongodb:
+  user: x
+  pass: x
+  host: localhost
+  port: 27017
+  db: misskey
+```
+3. migration ブランチに切り替え
+4. `npm i`
+5. `npm run build`
+6. `npm run init`
+7. `npm run migrate`
+8. master ブランチに戻す
+9. enjoy
+
+11.5.0 (2019/04/29)
+-------------------
+### 注意
+このアップデートを適用した後、プロセスを起動(もしくは再起動)する前にまず以下の手順を実行してください
+
+#### 1
+`ormconfig.json`という名前で、Misskeyのインストール場所(package.jsonとかがあるディレクトリ)に新たなファイルを作る。中身は次のようにします:
+``` json
+{
+	"type": "postgres",
+	"host": "PostgreSQLのホスト",
+	"port": 5432,
+	"username": "PostgreSQLのユーザー名",
+	"password": "PostgreSQLのパスワード",
+	"database": "PostgreSQLのデータベース名",
+	"entities": ["src/models/entities/*.ts"],
+	"migrations": ["migration/*.ts"],
+	"cli": {
+		"migrationsDir": "migration"
+	}
+}
+```
+上記の各種PostgreSQLの設定(ポートも)は、設定ファイルに書いてあるものをコピーしてください。
+
+#### 2
+```
+npm i -g ts-node
+```
+
+#### 3
+```
+ts-node ./node_modules/typeorm/cli.js migration:run
+```
+
+### New features
+#### MisskeyPages
+ページ(記事)を作成できるように。
+
+* 後から何度でも編集できる
+* アイキャッチを設定できる
+* フォントを設定できる
+* 画像を好きな位置に挿入できる
+* URLを決められる
+* タイトルを設定できる
+* 見出しを設定できる
+* ページの要約を設定できる(URLプレビュー時などに便利)
+* 変数や式(aka AiScript)を使用して動的なページも作れる
+* 目次自動生成(coming soon)
+
+ページを気に入ったら「いいね」しよう (coming soon)
+
+### Improvements
+* APIコンソールでパラメータテンプレートを表示するように
+
+### Fixes
+* おすすめユーザーに自分自身が含まれる問題を修正
+* ユーザーサジェストで表示名が変わらない問題を修正
+
+11.4.0 (2019/04/25)
+-------------------
+### Improvements
+* 検索でローカルの投稿のみに絞れるように
+* 検索で特定のインスタンスの投稿のみに絞れるように
+* 検索で特定のユーザーの投稿のみに絞れるように
+
+### Fixes
+* 投稿が増殖する問題を修正
+* ストリームで過去の投稿が流れてくる問題を修正
+* モバイル版のユーザーページで遷移してもユーザー名が変わらない問題を修正
+* お知らせを切り替えても内容が変わらない問題を修正
+
+11.3.1 (2019/04/24)
+-------------------
+### Fixes
+* Webからファイルがアップロードできない問題を修正
+
+11.3.0 (2019/04/24)
+-------------------
+### Improvements
+* お知らせにMFMを使えるように
+* お知らせに画像を添付できるように
+
+### Fixes
+* 投稿のタグ検索APIで大文字小文字が区別されていたのを修正
+* 公開範囲がホームの投稿がグローバルTLに流れる問題を修正
+* モバイルビューの投稿詳細にて acct が長いとアイコンが圧迫面接される問題を修正
+
+11.2.2 (2019/04/22)
+-------------------
+### Fixes
+* 2段階認証を有効にするとログインできない問題を修正
+* リモートユーザーの修復処理が自動的に実行されない問題を修正
+* リモートユーザー情報が更新されない問題を修正
+
+11.2.1 (2019/04/21)
+-------------------
+### Fixes
+* MEIDが25桁になっているのを修正
+* リモートユーザー情報が更新されない問題を修正
+
+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
 * アプリが作成できない問題を修正
 * 「ハイライト」が表示されない問題を修正
 * リモートの投稿に添付されている画像が小さい問題を修正
@@ -15,15 +233,19 @@ If you encounter any problems with updating, please try the following:
 
 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

@@ -1,6 +1,6 @@
 <a href="https://xn--931a.moe/"><img src="https://github.com/syuilo/misskey/blob/develop/assets/ai-orig.png?raw=true" align="right" height="320px"/></a>
 
-[![Misskey](/assets/title.png)](https://misskey.xyz/)
+[![Misskey](/assets/title.png)](https://misskey.io/)
 ================================================================
 
 [![CircleCI](https://img.shields.io/circleci/project/github/syuilo/misskey.svg?style=for-the-badge&logo=circleci)](https://circleci.com/gh/syuilo/misskey)
@@ -10,7 +10,7 @@
 **A forever evolving, sophisticated microblogging platform.**
 
 <p align="justify">
-<a href="https://misskey.xyz">Misskey</a> is a decentralized microblogging platform born on Earth.
+<a href="https://misskey.io">Misskey</a> is a decentralized microblogging platform born on Earth.
 Since it exists within the Fediverse (a universe where various social media platforms are organized),
 it is mutually linked with other social media platforms.
 Why don't you take a short break from the hustle and bustle of the city, and dive into a new Internet? <a href="https://joinmisskey.github.io/">Find an instance!</a>
@@ -88,12 +88,14 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 		<td><img src="https://avatars0.githubusercontent.com/u/10798641?s=460&v=4" alt="AyaMorisawa" width="100"></td>
 		<td><img src="https://avatars1.githubusercontent.com/u/30769358?s=460&v=4" alt="mei23" width="100"></td>
 		<td><img src="https://avatars2.githubusercontent.com/u/20679825?s=460&v=4" alt="acid-chicken" width="100"></td>
+		<td><img src="https://avatars2.githubusercontent.com/u/6533808?s=460&v=4" alt="rinsuki" width="100"></td>
 	</tr>
 	<tr>
 		<td align="center"><a href="https://github.com/syuilo">@syuilo</a></td>
 		<td align="center"><a href="https://github.com/AyaMorisawa">@AyaMorisawa</a></td>
 		<td align="center"><a href="https://github.com/mei23">@mei23</a></td>
 		<td align="center"><a href="https://github.com/acid-chicken">@acid-chicken</a></td>
+		<td align="center"><a href="https://github.com/rinsuki">@rinsuki</a></td>
 	</tr>
 </table>
 
@@ -102,14 +104,14 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <!-- PATREON_START -->
 <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://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12190916/fb7fa7983c14425f890369535b1506a4/3.png?token-time=2145916800&token-hash=oH_i7gJjNT7Ot6j9JiVwy7ZJIBqACVnzLqlz4YrDAZA%3D" alt="weepjp" 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>
 <td><img src="https://c8.patreon.com/2/200/16869916" alt="見当かなみ" width="100"></td>
 </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/weepjp">weepjp</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>
@@ -124,8 +126,8 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <td><img src="https://c8.patreon.com/2/200/17866454" alt="sikyosyounin" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/3.png?token-time=2145916800&token-hash=KjfQL8nf3AIf6WqzLshBYAyX44piAqOAZiYXgZS_H6A%3D" alt="YUKIMOCHI" width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/17463605" alt="Sampot" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/19356899/496b4681d33b4520bd7688e0fd19c04d/2.jpeg?token-time=2145916800&token-hash=_sTj3dUBOhn9qwiJ7F19Qd-yWWfUqJC_0jG1h0agEqQ%3D" alt="sheeta.s" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13737140/1adf7835017d479280d90fe8d30aade2/1.png?token-time=2145916800&token-hash=0pdle8h5pDZrww0BDOjdz6zO-HudeGTh36a3qi1biVU%3D" alt="Satsuki Yanagi" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/17880724/311738c8a48f4a6b9443c2445a75adde/1.jpe?token-time=2145916800&token-hash=CPxGQhKIlEaa6WUcgbyHixyKEhakiw9RFdOhsIJBQ_o%3D" alt="takimura" width="100"></td>
 </tr><tr>
 <td><a href="https://www.patreon.com/gutfuckllc">gutfuckllc</a></td>
 <td><a href="https://www.patreon.com/mydarkstar">mydarkstar</a></td>
@@ -135,20 +137,21 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <td><a href="https://www.patreon.com/user?u=17866454">sikyosyounin</a></td>
 <td><a href="https://www.patreon.com/yukimochi">YUKIMOCHI</a></td>
 <td><a href="https://www.patreon.com/user?u=17463605">Sampot</a></td>
+<td><a href="https://www.patreon.com/user?u=19356899">sheeta.s</a></td>
 <td><a href="https://www.patreon.com/user?u=13737140">Satsuki Yanagi</a></td>
-<td><a href="https://www.patreon.com/takimura">takimura</a></td>
 </tr></table>
 <table><tr>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/17880724/311738c8a48f4a6b9443c2445a75adde/1.jpe?token-time=2145916800&token-hash=CPxGQhKIlEaa6WUcgbyHixyKEhakiw9RFdOhsIJBQ_o%3D" alt="takimura" width="100"></td>
 <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>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4503830/ccf2cc867ea64de0b524bb2e24b9a1cb/1.jpeg?token-time=2145916800&token-hash=L55UhJ0rcuNAH3w_ryeeGN4hC6taoOixyAhraEi0bzw%3D" alt="dansup" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/619786/32cf01444db24e578cd1982c197f6fc6/1.jpeg?token-time=2145916800&token-hash=d8jBQLMOHD87KtXs5C9fk1o58DMF73pQ-dYH3uZJPBE%3D" alt="Gargron" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5731881/4b6038e6cda34c04b83a5fcce3806a93/1.png?token-time=2145916800&token-hash=hBayGfOmQH3kRMdNnDe4oCZD_9fsJWSt29xXR3KRMVk%3D" alt="Nokotaro Takeda" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1.jpeg?token-time=2145916800&token-hash=vGe7wXGqmA8Q7m-kDNb6fyGdwk-Dxk4F-ut8ZZu51RM%3D" alt="Takashi Shibuya" width="100"></td>
 </tr><tr>
+<td><a href="https://www.patreon.com/takimura">takimura</a></td>
 <td><a href="https://www.patreon.com/damillora">Damillora</a></td>
 <td><a href="https://www.patreon.com/user?u=16900731">Atsuko Tominaga</a></td>
 <td><a href="https://www.patreon.com/user?u=4389829">natalie</a></td>
@@ -157,13 +160,14 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <td><a href="https://www.patreon.com/dansup">dansup</a></td>
 <td><a href="https://www.patreon.com/mastodon">Gargron</a></td>
 <td><a href="https://www.patreon.com/takenoko">Nokotaro Takeda</a></td>
-<td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
 </tr></table>
 <table><tr>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1.jpeg?token-time=2145916800&token-hash=vGe7wXGqmA8Q7m-kDNb6fyGdwk-Dxk4F-ut8ZZu51RM%3D" alt="Takashi Shibuya" width="100"></td>
 </tr><tr>
+<td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
 </tr></table>
 
-**Last updated:** Mon, 15 Apr 2019 01:59:07 UTC
+**Last updated:** Wed, 24 Apr 2019 05:56:07 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.
-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.
+1. Clone Misskey repository's master branch.
+
+	`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`
-2. `git stash`
-3. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)`
+1. `git stash`
+2. `git checkout master`
+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.
-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).
+1. Clone le dépôt de Misskey sur la branche master.
+
+	`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`
-2. `git stash`
-3. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)`
+1. `git stash`
+2. `git checkout master`
+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
-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)
+1. Permet de créer le dossier d'accueil de la base ElasticSearch aves les bons droits
+
+	`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
-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
+1. Connexion dans le conteneur web
+
+	`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レポジトリをクローン
-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)を確認
+1. masterブランチからMisskeyレポジトリをクローン
+
+	`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`
-2. `git stash`
-3. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)`
+1. `git stash`
+2. `git checkout master`
+3. `git pull`
 4. `git stash pop`
 5. `docker-compose build`
 6. [ChangeLog](../CHANGELOG.md)でマイグレーション情報を確認する

docs/setup.en.md

@@ -32,15 +32,32 @@ Please install and setup these softwares:
 
 *3.* Install Misskey
 ----------------------------------------------------------------
-1. `su - misskey` 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
-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.
+1. Connect to misskey user.
+
+	`su - misskey`
+
+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]
-Description=Misskey daemon
+	```
+	[Unit]
+	Description=Misskey daemon
 
-[Service]
-Type=simple
-User=misskey
-ExecStart=/usr/bin/npm start
-WorkingDirectory=/home/misskey/misskey
-Environment="NODE_ENV=production"
-TimeoutSec=60
-StandardOutput=syslog
-StandardError=syslog
-SyslogIdentifier=misskey
-Restart=always
+	[Service]
+	Type=simple
+	User=misskey
+	ExecStart=/usr/bin/npm start
+	WorkingDirectory=/home/misskey/misskey
+	Environment="NODE_ENV=production"
+	TimeoutSec=60
+	StandardOutput=syslog
+	StandardError=syslog
+	SyslogIdentifier=misskey
+	Restart=always
 
-[Install]
-WantedBy=multi-user.target
-```
+	[Install]
+	WantedBy=multi-user.target
+	```
 
-3. `systemctl daemon-reload ; systemctl enable misskey` Reload systemd and enable the misskey service.
-4. `systemctl start misskey` Start the misskey service.
+3. Reload systemd and enable 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`
-2. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)`
+1. `git checkout master`
+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.
-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.
-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.
+1. Basculez vers l'utilisateur misskey.
+
+	`su - 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]
-Description=Misskey daemon
+	```
+	[Unit]
+	Description=Misskey daemon
 
-[Service]
-Type=simple
-User=misskey
-ExecStart=/usr/bin/npm start
-WorkingDirectory=/home/misskey/misskey
-Environment="NODE_ENV=production"
-TimeoutSec=60
-StandardOutput=syslog
-StandardError=syslog
-SyslogIdentifier=misskey
-Restart=always
+	[Service]
+	Type=simple
+	User=misskey
+	ExecStart=/usr/bin/npm start
+	WorkingDirectory=/home/misskey/misskey
+	Environment="NODE_ENV=production"
+	TimeoutSec=60
+	StandardOutput=syslog
+	StandardError=syslog
+	SyslogIdentifier=misskey
+	Restart=always
 
-[Install]
-WantedBy=multi-user.target
-```
+	[Install]
+	WantedBy=multi-user.target
+	```
 
-3. `systemctl daemon-reload ; systemctl enable misskey` Redémarre systemd et active le service misskey.
-4. `systemctl start misskey` Démarre le service misskey.
+3. Redémarre systemd et active 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`
-2. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)`
+1. `git checkout master`
+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ユーザーを使用
-2. `git clone -b master git://github.com/syuilo/misskey.git` masterブランチからMisskeyレポジトリをクローン
-3. `cd misskey` 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の依存パッケージをインストール
+1. misskeyユーザーを使用
+
+	`su - 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]
-Description=Misskey daemon
+	```
+	[Unit]
+	Description=Misskey daemon
 
-[Service]
-Type=simple
-User=misskey
-ExecStart=/usr/bin/npm start
-WorkingDirectory=/home/misskey/misskey
-Environment="NODE_ENV=production"
-TimeoutSec=60
-StandardOutput=syslog
-StandardError=syslog
-SyslogIdentifier=misskey
-Restart=always
+	[Service]
+	Type=simple
+	User=misskey
+	ExecStart=/usr/bin/npm start
+	WorkingDirectory=/home/misskey/misskey
+	Environment="NODE_ENV=production"
+	TimeoutSec=60
+	StandardOutput=syslog
+	StandardError=syslog
+	SyslogIdentifier=misskey
+	Restart=always
 
-[Install]
-WantedBy=multi-user.target
-```
-CentOSで1024以下のポートを使用してMisskeyを使用する場合は`ExecStart=/usr/bin/sudo /usr/bin/npm start`に変更する必要があります。
+	[Install]
+	WantedBy=multi-user.target
+	```
 
-3. `systemctl daemon-reload ; systemctl enable misskey` systemdを再読み込みしmisskeyサービスを有効化
-4. `systemctl start misskey` misskeyサービスの起動
+	CentOSで1024以下のポートを使用してMisskeyを使用する場合は`ExecStart=/usr/bin/sudo /usr/bin/npm start`に変更する必要があります。
+
+3. systemdを再読み込みしmisskeyサービスを有効化
+
+	`systemctl daemon-reload ; systemctl enable misskey`
+
+4. misskeyサービスの起動
+
+	`systemctl start misskey`
 
 `systemctl status misskey`と入力すると、サービスの状態を調べることができます。
 
 ### Misskeyを最新バージョンにアップデートする方法:
-1. `git fetch`
-2. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)`
+1. `git checkout master`
+2. `git pull`
 3. `npm install`
 4. `NODE_ENV=production npm run build`
 5. [ChangeLog](../CHANGELOG.md)でマイグレーション情報を確認する

locales/cs-CZ.yml

@@ -70,8 +70,17 @@ common:
   followers: "Sledující"
   favorites: "Oblíbené"
   permissions:
-    'read:drive': "Prohlížet Disk"
-    'write:drive': "Pracovat s Diskem"
+    "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é"
+    "read:notifications": "Prohlížet oznámení"
+    "write:notifications": "Pracovat s oznámeními"
+    "read:reactions": "Prohlížet reakce"
+    "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"
@@ -279,6 +288,7 @@ common:
     nav: "Navigace"
     tips: "Tipy"
     hashtags: "Hashtagy"
+    queue: "Ve frontě"
   dev: "Nepodařilo se vytvořit aplikace. Prosím zkuste to znovu."
   ai-chan-kawaii: "Ai-chan kawaii!"
   you: "Vy"
@@ -587,6 +597,8 @@ common/views/components/user-list-editor.vue:
   remove-user: "Odebrat z tohoto seznamu"
   delete-are-you-sure: "Smazat seznam \"$1\"?"
   deleted: "Smazáno"
+common/views/components/user-lists.vue:
+  list-name: "Název seznamu"
 common/views/widgets/broadcast.vue:
   fetching: "Načítám"
   next: "Další"
@@ -826,8 +838,6 @@ desktop/views/components/received-follow-requests-window.vue:
   reject: "Odmítnout"
 desktop/views/components/user-lists-window.vue:
   title: "Seznamy uživatelů"
-  create-list: "Vytvořit seznam"
-  list-name: "Název seznamu"
 desktop/views/components/user-preview.vue:
   notes: "Příspěvky"
 desktop/views/components/users-list.vue:
@@ -1072,7 +1082,6 @@ mobile/views/components/drive.vue:
   used: "využito"
   file-count: "Soubor(ů)"
   folder-is-empty: "Tato složka je prázdná"
-  deletion-alert: "Omlouváme se, ale mazání složek ještě nebylo implementováno."
   folder-name: "Název složky"
   url-prompt: "URL adresa souboru, který chcete nahrát"
   uploading: "Byl zahájen upload. Může chvilku trvat než bude dokončen."
@@ -1114,7 +1123,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:
@@ -1133,6 +1142,10 @@ mobile/views/components/ui.nav.vue:
   game: "Hry"
   admin: "Administrace"
   about: "O Misskey"
+mobile/views/pages/drive.vue:
+  contextmenu:
+    upload: "Nahrát soubor"
+    create-folder: "Vytvořit složku"
 mobile/views/pages/user-lists.vue:
   title: "Seznamy"
 mobile/views/pages/signup.vue:
@@ -1185,4 +1198,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

@@ -62,10 +62,14 @@ common:
   followers: "Folgende"
   favorites: "Diesen Beitrag favorisieren"
   permissions:
-    'read:account': "Accountinformationen anzeigen."
-    'write:account': "Accountinformationen bearbeiten."
-    'read:drive': "Dateien anzeigen"
-    'write:drive': "Dateien bearbeiten"
+    "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"
@@ -672,6 +676,10 @@ mobile/views/components/ui.nav.vue:
   user-lists: "Listen"
   game: "Spielen"
   about: "Über"
+mobile/views/pages/drive.vue:
+  contextmenu:
+    upload: "Eine Datei hochladen"
+    create-folder: "Ein Verzeichnis erstellen"
 mobile/views/pages/user-lists.vue:
   title: "Listen"
 mobile/views/pages/home.vue:
@@ -739,10 +747,7 @@ dev/views/new-app.vue:
   create-app: "Erstelle Anwendung"
   app-name: "Name der Anwendung"
   app-name-desc: "Der Name der Anwendung"
-  app-name-ex: "z.B. Misskey für iOS"
   app-overview: "Beschreibung der Anwendung"
-  app-desc: "Eine kurze Beschreibung oder Einführung der Anwendung."
-  app-desc-ex: "z.B. Ein iOS-Client für Misskey."
   callback-url: "Callback-URL (optional)"
   callback-url-desc: "Die URL, auf die nach erfolgreicher Authentifizierung umgeleitet werden soll."
   authority: "Berechtigungen"

locales/en-US.yml

@@ -70,10 +70,26 @@ common:
   followers: "Followers"
   favorites: "Favorites"
   permissions:
-    'read:account': "View account information"
-    'write:account': "Update your account information"
-    'read:drive': "Browse the Drive"
-    'write:drive': "Work with the Drive"
+    "read:account": "View account information"
+    "write:account": "Update your account information"
+    "read:blocks": "View Blocks"
+    "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:notes": "Create and delete posts"
+    "read:notifications": "View notifications"
+    "write:notifications": "Work with notifications"
+    "read:reactions": "View reactions"
+    "write:reactions": "Work with reactions"
+    "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 +297,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"
@@ -472,8 +489,12 @@ common/views/components/user-menu.vue:
   mention: "Mention"
   mute: "Mute"
   unmute: "Unmute"
+  mute-confirm: "Are you sure you want to mute this user?"
+  unmute-confirm: "Are you certain that you want to unmute this user?"
   block: "Block"
   unblock: "Unblock"
+  block-confirm: "Are you sure you want to block this user?"
+  unblock-confirm: "Are you certain that you want to unblock this user?"
   push-to-list: "Add to list"
   select-list: "Select a list"
   report-abuse: "Report abuse"
@@ -481,8 +502,12 @@ common/views/components/user-menu.vue:
   report-abuse-reported: "The issue has been reported to the administrator. Your cooperation is much appreciated."
   silence: "Silence"
   unsilence: "Unsilence"
+  silence-confirm: "Are you sure that you want to silence this user?"
+  unsilence-confirm: "Are you sure that you want to stop silencing this user?"
   suspend: "Suspend"
   unsuspend: "Unsuspend"
+  suspend-confirm: "Are you sure that you want to suspend this user?"
+  unsuspend-confirm: "Are you sure that you want to unsuspend this user?"
 common/views/components/poll.vue:
   vote-to: "Vote for '{}'"
   vote-count: "{} votes"
@@ -665,6 +690,9 @@ common/views/components/user-list-editor.vue:
   remove-user: "Remove from this list"
   delete-are-you-sure: "Delete list \"$1\"?"
   deleted: "Deleted successfully"
+common/views/components/user-lists.vue:
+  create-list: "Create a list"
+  list-name: "List name"
 common/views/widgets/broadcast.vue:
   fetching: "Checking"
   no-broadcasts: "No announcements"
@@ -1013,8 +1041,6 @@ desktop/views/components/received-follow-requests-window.vue:
   reject: "Reject"
 desktop/views/components/user-lists-window.vue:
   title: "User lists"
-  create-list: "Create a list"
-  list-name: "List name"
 desktop/views/components/user-preview.vue:
   notes: "Posts"
   following: "Following"
@@ -1192,7 +1218,9 @@ admin/views/users.vue:
   unsuspend-confirm: "Are you sure you want to unsuspend this account?"
   unsuspended: "The user has successfully unsuspended."
   make-silence: "Silence"
+  silence-confirm: "Silence user?"
   unmake-silence: "Unsilence"
+  unsilence-confirm: "Are you certain that you want to stop silencing this user?"
   verify: "Verify account"
   verify-confirm: "Do you want this to be a verified account?"
   verified: "The account is now being verified"
@@ -1386,6 +1414,7 @@ desktop/views/widgets/polls.vue:
 desktop/views/widgets/post-form.vue:
   title: "Post"
   note: "Post"
+  something-happened: "Could not be posted in this circumstance."
 desktop/views/widgets/profile.vue:
   update-banner: "Click to edit your banner"
   update-avatar: "Click to edit your avatar"
@@ -1404,12 +1433,11 @@ mobile/views/components/drive.vue:
   file-count: "File(s)"
   nothing-in-drive: "There's nothing stored."
   folder-is-empty: "This folder is empty"
-  prompt: "What do you want to do? (Please enter a number): <1 → Upload a file | 2 → Upload a file from a URL | 3 → Create a folder | 4 → Change this folder's name | 5 → Move this folder | 6 → Delete this folder>"
-  deletion-alert: "Sorry! Deleting a folder is not yet implemented."
   folder-name: "Folder name"
   here-is-root: "Currently, you are on the root, not inside of any folder."
   url-prompt: "URL of the file you want to upload"
   uploading: "Upload requested. It may take a while for the upload to finish."
+  folder-name-cannot-empty: "Folder name cannot be blank."
 mobile/views/components/drive-file-chooser.vue:
   select-file: "Choose files"
 mobile/views/components/drive-folder-chooser.vue:
@@ -1462,7 +1490,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:
@@ -1483,9 +1511,16 @@ mobile/views/components/ui.nav.vue:
   game: "Games"
   admin: "Admin"
   about: "About Misskey"
+mobile/views/pages/drive.vue:
+  contextmenu:
+    upload: "Upload a file"
+    url-upload: "Upload file from a URL"
+    create-folder: "Create a folder"
+    rename-folder: "Rename folder"
+    move-folder: "Move this folder"
+    delete-folder: "Delete this folder"
 mobile/views/pages/user-lists.vue:
   title: "Lists"
-  enter-list-name: "Enter a name of the list to make"
 mobile/views/pages/signup.vue:
   lets-start: "Your account is now ready! 📦"
 mobile/views/pages/followers.vue:
@@ -1612,13 +1647,12 @@ dev/views/apps.vue:
   create-app: "Create app"
   app-missing: "No apps"
 dev/views/new-app.vue:
+  new-app: "New Application"
   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."
+  app-overview-desc: "A brief description, or an introduction of your app."
   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"
@@ -420,6 +466,8 @@ common/views/components/profile-editor.vue:
   enter-password: "Escribe una contraseña"
 common/views/components/user-list-editor.vue:
   users: "Usuarios"
+common/views/components/user-lists.vue:
+  list-name: "Nombre de lista"
 common/views/widgets/broadcast.vue:
   fetching: "Recuperando"
   no-broadcasts: "Sin emisión"
@@ -727,8 +775,6 @@ desktop/views/components/received-follow-requests-window.vue:
   reject: "Rechazar"
 desktop/views/components/user-lists-window.vue:
   title: "Listas de usuario"
-  create-list: "Crear lista"
-  list-name: "Nombre de lista"
 desktop/views/components/user-preview.vue:
   notes: "Publicaciones"
   following: "Sigue"
@@ -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"
@@ -884,6 +931,10 @@ mobile/views/components/ui.nav.vue:
   game: "Juegos"
   admin: "Admin"
   about: "Sobre"
+mobile/views/pages/drive.vue:
+  contextmenu:
+    upload: "Subir fichero"
+    create-folder: "Crear una carpeta"
 mobile/views/pages/user-lists.vue:
   title: "Listas"
 mobile/views/pages/home.vue:

locales/fr-FR.yml

@@ -13,7 +13,7 @@ common:
     rich-contents-desc: "Partagez vos idées, les événements et les sujets qui vous tiennent à cœur ainsi que tout autre chose que vous souhaitez partager avec les autres. Si vous le désirez, vous pouvez décorer vos messages en utilisant une syntaxe différente ou en y joignant des sondages et des fichiers, tels que les photos ou les vidéos que vous aimez."
     reaction: "Réactions"
     reaction-desc: "Une manière simple d'exprimer vos émotions. Misskey peut attacher diverses réactions aux publications des autres utilisateurs. Si vous essayez les réactions sur Misskey, vous ne pourrez plus retourner sur une autre plateforme de réseaux sociaux n'offrant que des « J'aime »."
-    ui: "Interface utilisateur"
+    ui: "Interface"
     ui-desc: "Aucune interface graphique ne peut plaire à tout le monde. Par conséquent, Misskey possède une interface utilisateur hautement personnalisable selon vos goûts. Vous pouvez rendre votre page d'accueil originale en modifiant la mise en page de votre fil et en déplaçant les widgets que vous pouvez facilement ajuster pour vous approprier cet espace."
     drive: "Drive"
     drive-desc: "Vous voulez poster une photo que vous avez déjà transférée ? Vous souhaitez organiser, nommer et créer un dossier pour vos fichiers téléversés ? Misskey Drive est la meilleure solution pour vous. Très facile de partager vos fichiers en ligne."
@@ -33,6 +33,7 @@ common:
   signin: "Se connecter"
   signup: "S'enregistrer"
   signout: "Se déconnecter"
+  reload-to-apply-the-setting: "Le rechargement de la page est nécessaire pour appliquer ces paramètres. Désirez-vous la recharger maintenant ?"
   got-it: "J’ai compris !"
   customization-tips:
     title: "Conseils de personnalisation"
@@ -68,10 +69,15 @@ common:
   followers: "Abonné·e·s"
   favorites: "Mettre cette note en favoris"
   permissions:
-    'read:account': "Afficher les informations du compte"
-    'write:account': "Mettre à jour les informations de votre compte"
-    'read:drive': "Parcourir le Drive"
-    'write:drive': "Écrire sur le Drive"
+    "read:account": "Afficher les informations du compte"
+    "write:account": "Mettre à jour les informations de votre compte"
+    "read:drive": "Parcourir le Drive"
+    "write:drive": "Écrire sur le Drive"
+    "read:favorites": "Afficher les favoris"
+    "write:notes": "Créer ou supprimer des publications"
+    "read:notifications": "Afficher les notifications"
+    "read:reactions": "Lire les réactions"
+    "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"
@@ -135,6 +141,7 @@ common:
     appearance: "Apparence"
     behavior: "Comportement"
     fetch-on-scroll: "Chargement automatique lors du défilement"
+    fetch-on-scroll-desc: "Chargement automatique du contenu lors du défilement de la page."
     note-visibility: "Visibilité de la publication"
     default-note-visibility: "Visibilité par défaut"
     remember-note-visibility: "Se souvenir du mode de visibilité de la publication"
@@ -205,16 +212,16 @@ common:
     debug-mode: "Activer le mode débogage"
     debug-mode-desc: "Ce paramètre est stocké dans le navigateur."
     navbar-position: "Position de la barre de navigation"
-    navbar-position-top: "en haut"
+    navbar-position-top: "En haut"
     navbar-position-left: "À gauche"
-    navbar-position-right: "à droite"
+    navbar-position-right: "À droite"
     i-am-under-limited-internet: "J'ai un accès Internet limité"
     post-style: "Style d'affichage des notes"
     post-style-standard: "Standard"
     post-style-smart: "Intelligent"
     notification-position: "Afficher les notifications"
     notification-position-bottom: "en bas"
-    notification-position-top: "en haut"
+    notification-position-top: "En haut"
     disable-via-mobile: "Enlever la mention publié via 'mobile'"
     load-raw-images: "Afficher les photos jointes dans leur qualité originale"
     load-remote-media: "Afficher les médias depuis le serveur distant"
@@ -274,6 +281,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"
@@ -302,6 +310,7 @@ common/views/pages/explore.vue:
   explore: "Explorer {host}"
   users-info: "Actuellement, {users} utilisateurs se sont inscrit ici"
 common/views/components/url-preview.vue:
+  enable-player: "Activer la lecture"
   disable-player: "Fermer le lecteur"
 common/views/components/user-list.vue:
   no-users: "Il n'y a aucun utilisateur"
@@ -642,6 +651,7 @@ common/views/components/profile-editor.vue:
     blocking-list: "Liste des comptes bloqués"
     user-lists: "Listes"
   export-requested: "Vous avez demandé une exportation. Cela peut prendre un certain temps. Une fois l'exportation terminée, le fichier résultant sera ajouté dans le Drive."
+  import-requested: "Vous avez initié un import. Ceci peut prendre un peu de temps."
   enter-password: "Veuillez saisir votre mot de passe"
   danger-zone: "Zone de danger"
   delete-account: "Supprimer le compte"
@@ -653,6 +663,9 @@ common/views/components/user-list-editor.vue:
   remove-user: "Retirer de cette liste"
   delete-are-you-sure: "Voulez-vous vraiment supprimer la liste « $1 » ?"
   deleted: "Supprimé"
+common/views/components/user-lists.vue:
+  create-list: "Créer une liste"
+  list-name: "Nom de la liste"
 common/views/widgets/broadcast.vue:
   fetching: "Récupération"
   no-broadcasts: "Aucune annonce"
@@ -953,6 +966,7 @@ common/views/components/password-settings.vue:
   changed: "Mot de passe modifié avec succès"
   failed: "Échec lors de la modification du mot de passe"
 common/views/components/post-form-attaches.vue:
+  attach-cancel: "Enlever le fichier attaché"
   mark-as-sensitive: "Marquer comme sensible"
   unmark-as-sensitive: "Ne pas marquer comme sensible"
 desktop/views/components/sub-note-content.vue:
@@ -999,8 +1013,6 @@ desktop/views/components/received-follow-requests-window.vue:
   reject: "Refuser"
 desktop/views/components/user-lists-window.vue:
   title: "Listes de l'utilisateur"
-  create-list: "Créer une liste"
-  list-name: "Nom de la liste"
 desktop/views/components/user-preview.vue:
   notes: "Publications"
   following: "Abonné à"
@@ -1377,8 +1389,6 @@ mobile/views/components/drive.vue:
   file-count: "Fichier·s"
   nothing-in-drive: "Rien"
   folder-is-empty: "Ce dossier est vide"
-  prompt: "Que veux-tu faire ? (Entrez un nombre): <1 → Télécharger le fichier | 2 → Télécharger le fichier avec l'URL | 3 → Créer le dossier | 4 → Modifier le nom du dossier | 5 → Déplacer ce dossier | 6 → Supprimer ce dossier >"
-  deletion-alert: "Désolé ! La suppression d’un dossier n’est pas encore implémentée."
   folder-name: "Nom du dossier"
   url-prompt: "URL du fichier que vous souhaitez téléverser"
   uploading: "Envoi demandé. Le téléversement pourrait prendre un certain temps avant de s'achever."
@@ -1434,7 +1444,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:
@@ -1455,9 +1465,12 @@ mobile/views/components/ui.nav.vue:
   game: "Jeux"
   admin: "Admin"
   about: "À propos de Misskey"
+mobile/views/pages/drive.vue:
+  contextmenu:
+    upload: "Téléverser un fichier"
+    create-folder: "Créer un dossier"
 mobile/views/pages/user-lists.vue:
   title: "Listes"
-  enter-list-name: "Nom de la liste"
 mobile/views/pages/signup.vue:
   lets-start: "Votre compte est prêt ! 📦"
 mobile/views/pages/followers.vue:
@@ -1586,10 +1599,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:
@@ -64,6 +65,7 @@ common:
 
   trash: "ゴミ箱"
   drive: "ドライブ"
+  pages: "ページ"
   messaging: "トーク"
   home: "ホーム"
   deck: "デッキ"
@@ -313,6 +315,7 @@ common:
     nav: "ナビゲーション"
     tips: "ヒント"
     hashtags: "ハッシュタグ"
+    queue: "キュー"
 
   dev: "アプリの作成に失敗しました。再度お試しください。"
   ai-chan-kawaii: "藍ちゃかわいい"
@@ -526,8 +529,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: "スパムを報告"
@@ -535,8 +542,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: "「{}」に投票する"
@@ -738,6 +749,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: "お知らせはありません"
@@ -1144,8 +1159,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: "投稿"
@@ -1335,7 +1348,9 @@ admin/views/users.vue:
   unsuspend-confirm: "凍結を解除しますか？"
   unsuspended: "凍結を解除しました"
   make-silence: "サイレンス"
+  silence-confirm: "サイレンスしますか？"
   unmake-silence: "サイレンスの解除"
+  unsilence-confirm: "サイレンスを解除しますか？"
   verify: "公式アカウントにする"
   verify-confirm: "公式アカウントにしますか？"
   verified: "公式アカウントにしました"
@@ -1549,6 +1564,7 @@ desktop/views/widgets/polls.vue:
 desktop/views/widgets/post-form.vue:
   title: "投稿"
   note: "投稿"
+  something-happened: "何らかの事情で投稿できませんでした。"
 
 desktop/views/widgets/profile.vue:
   update-banner: "クリックでバナー編集"
@@ -1571,12 +1587,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: "ファイルを選択"
@@ -1641,7 +1656,7 @@ mobile/views/components/post-form.vue:
   quote-placeholder: "この投稿を引用... (オプション)"
   reply-placeholder: "この投稿への返信..."
   cw-placeholder: "内容への注釈 (オプション)"
-  location-alert: "お使いの端末は位置情報に対応していません"
+  geolocation-alert: "お使いの端末は位置情報に対応していません"
   error: "エラー"
   username-prompt: "ユーザー名を入力してください"
 
@@ -1666,9 +1681,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: "📦 始めましょう"
@@ -1791,26 +1814,6 @@ docs:
   edit-this-page-on-github: "間違いや改善点を見つけましたか？"
   edit-this-page-on-github-link: "このページをGitHubで編集"
 
-  api:
-    entities:
-      properties: "プロパティ"
-    endpoints:
-      params: "パラメータ"
-      no-params: "パラメータはありません"
-      res: "レスポンス"
-      require-credential: "このエンドポイントは認証情報が必須です。"
-      require-permission: "このエンドポイントは{permission}の権限を必要とします。"
-      has-limit: "レートリミットがあります。"
-      duration-limit: "直近{duration}ミリ秒の間のこのエンドポイントへのリクエスト数の合計が{max}を超える場合はリクエストできません。"
-      min-interval-limit: "前回のリクエストから{interval}ミリ秒経っていない場合はリクエストできません。"
-      show-src: "このエンドポイントのソースコードも閲覧できます。"
-      show-src-link: "コードをGitHubで見る"
-      generated: "このドキュメントはAPI定義に基づき自動生成されています。"
-    props:
-      name: "名前"
-      type: "型"
-      description: "説明"
-
 dev/views/index.vue:
   manage-apps: "アプリの管理"
 
@@ -1835,3 +1838,165 @@ dev/views/new-app.vue:
   authority: "権限"
   authority-desc: "ここで要求した機能だけがAPIからアクセスできます。"
   authority-warning: "アプリ作成後も変更できますが、新たな権限を付与する場合、その時点で関連付けられているユーザーキーはすべて無効になります。"
+
+pages:
+  new-page: "ページの作成"
+  edit-page: "ページの編集"
+  page-created: "ページを作成しました"
+  page-updated: "ページを更新しました"
+  are-you-sure-delete: "このページを削除しますか？"
+  page-deleted: "ページを削除しました"
+  edit-this-page: "このページを編集"
+  variables: "変数"
+  variables-info: "変数を使うことで動的なページを作成できます。テキスト内で <b>{ 変数名 }</b> と書くとそこに変数の値を埋め込めます。例えば <b>Hello { thing } world!</b> というテキストで、変数(thing)の値が <b>ai</b> だった場合、テキストは <b>Hello ai world!</b> になります。"
+  variables-info2: "変数の評価(値を算出すること)は上から下に行われるので、ある変数の中で自分より下の変数を参照することはできません。例えば上から <b>A、B、C</b> と3つの変数を定義したとき、<b>C</b>の中で<b>A</b>や<b>B</b>を参照することはできますが、<b>A</b>の中で<b>B</b>や<b>C</b>を参照することはできません。"
+  variables-info3: "ユーザーからの入力を受け取るには、ページに「ユーザー入力」ブロックを設置し、「変数名」に入力を格納したい変数名を設定します(変数は自動で作成されます)。その変数を使ってユーザー入力に応じた動作を行えます。"
+  more-details: "詳しい説明"
+  title: "タイトル"
+  url: "ページURL"
+  summary: "ページの要約"
+  align-center: "中央寄せ"
+  font: "フォント"
+  fontSerif: "セリフ"
+  fontSansSerif: "サンセリフ"
+  set-eye-catchig-image: "アイキャッチ画像を設定"
+  remove-eye-catchig-image: "アイキャッチ画像を削除"
+  choose-block: "ブロックを追加"
+  select-type: "種類を選択"
+  enter-variable-name: "変数名を決めてください"
+  the-variable-name-is-already-used: "その変数名は既に使われています"
+  blocks:
+    text: "テキスト"
+    section: "セクション"
+    image: "画像"
+    button: "ボタン"
+    input: "ユーザー入力"
+    _input:
+      name: "変数名"
+      text: "タイトル"
+      default: "デフォルト値"
+      inputType: "入力の種類"
+      _inputType:
+        string: "テキスト"
+        number: "数値"
+    switch: "スイッチ"
+    _switch:
+      name: "変数名"
+      text: "タイトル"
+      default: "デフォルト値"
+    _button:
+      text: "タイトル"
+      action: "ボタンを押したときの動作"
+      _action:
+        dialog: "ダイアログを表示する"
+        _dialog:
+          content: "内容"
+        resetRandom: "乱数をリセット"
+  script:
+    categories:
+      flow: "制御"
+      logical: "論理演算"
+      operation: "計算"
+      comparison: "比較"
+      random: "ランダム"
+      value: "値"
+      fn: "関数"
+    blocks:
+      text: "テキスト"
+      multiLineText: "テキスト(複数行)"
+      textList: "テキストのリスト"
+      add: "+ 足す"
+      _add:
+        arg1: "A"
+        arg2: "B"
+      subtract: "- 引く"
+      _subtract:
+        arg1: "A"
+        arg2: "B"
+      multiply: "× 掛ける"
+      _multiply:
+        arg1: "A"
+        arg2: "B"
+      divide: "÷ 割る"
+      _divide:
+        arg1: "A"
+        arg2: "B"
+      eq: "AとBが同じ"
+      _eq:
+        arg1: "A"
+        arg2: "B"
+      notEq: "AとBが異なる"
+      _notEq:
+        arg1: "A"
+        arg2: "B"
+      and: "AかつB"
+      _and:
+        arg1: "A"
+        arg2: "B"
+      or: "AまたはB"
+      _or:
+        arg1: "A"
+        arg2: "B"
+      lt: "< AがBより小さい"
+      _lt:
+        arg1: "A"
+        arg2: "B"
+      gt: "> AがBより大きい"
+      _gt:
+        arg1: "A"
+        arg2: "B"
+      ltEq: "<= AがBと同じか小さい"
+      _ltEq:
+        arg1: "A"
+        arg2: "B"
+      gtEq: ">= AがBと同じか大きい"
+      _gtEq:
+        arg1: "A"
+        arg2: "B"
+      if: "分岐"
+      _if:
+        arg1: "もし"
+        arg2: "なら"
+        arg3: "そうでなければ"
+      not: "否定"
+      _not:
+        arg1: "否定"
+      random: "ランダム"
+      _random:
+        arg1: "確率"
+      rannum: "乱数"
+      _rannum:
+        arg1: "最小"
+        arg2: "最大"
+      randomPick: "リストからランダムに選択"
+      _randomPick:
+        arg1: "リスト"
+      dailyRandom: "ランダム (ユーザーごとに日替わり)"
+      _dailyRandom:
+        arg1: "確率"
+      dailyRannum: "乱数 (ユーザーごとに日替わり)"
+      _dailyRannum:
+        arg1: "最小"
+        arg2: "最大"
+      dailyRandomPick: "リストからランダムに選択 (ユーザーごとに日替わり)"
+      _dailyRandomPick:
+        arg1: "リスト"
+      number: "数"
+      ref: "変数"
+      in: "入力"
+      _in:
+        arg1: "スロット番号"
+      fn: "関数"
+      _fn:
+        arg1: "出力"
+    typeError: "スロット{slot}は\"{expect}\"を受け付けますが、\"{actual}\"が入れられています！"
+    thereIsEmptySlot: "スロット{slot}が空です！"
+    types:
+      string: "テキスト"
+      number: "数値"
+      boolean: "フラグ"
+      array: "リスト"
+      stringArray: "テキストのリスト"
+    emptySlot: "空のスロット"
+    enviromentVariables: "環境変数"
+    pageVariables: "ページ要素"

locales/ja-KS.yml

@@ -60,6 +60,8 @@ common:
   following: "フォローしとる"
   followers: "フォロワー"
   favorites: "お気に入り"
+  permissions:
+    "write:votes": "投票するで"
   weekday-short:
     sunday: "日"
     monday: "月"
@@ -476,6 +478,8 @@ common/views/components/profile-editor.vue:
   enter-password: "パスワードを入れてや"
 common/views/components/user-list-editor.vue:
   users: "ユーザー"
+common/views/components/user-lists.vue:
+  list-name: "リスト名"
 common/views/widgets/broadcast.vue:
   fetching: "見てみるわ…"
   no-broadcasts: "お知らせはあらへんで"
@@ -813,8 +817,6 @@ desktop/views/components/received-follow-requests-window.vue:
   reject: "許さん"
 desktop/views/components/user-lists-window.vue:
   title: "リスト"
-  create-list: "新しいリストを作成"
-  list-name: "リスト名"
 desktop/views/components/user-preview.vue:
   notes: "投稿"
   following: "フォロー"
@@ -1069,8 +1071,6 @@ 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: "フォルダー名"
   url-prompt: "このURLのファイルをアップロードしたいねん"
   uploading: "アップロードをリクエストしたで。アップロードが完了するまで時間がかかるかも分からん、知らんけど。"
@@ -1126,7 +1126,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:
@@ -1147,9 +1147,12 @@ mobile/views/components/ui.nav.vue:
   game: "ゲーム"
   admin: "管理"
   about: "Misskeyってなんや？"
+mobile/views/pages/drive.vue:
+  contextmenu:
+    upload: "ファイル上げる"
+    create-folder: "フォルダー作る"
 mobile/views/pages/user-lists.vue:
   title: "リスト"
-  enter-list-name: "リスト名を入力してや"
 mobile/views/pages/signup.vue:
   lets-start: "📦 始めようや"
 mobile/views/pages/followers.vue:
@@ -1272,10 +1275,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': "계정 정보 보기"
-    'write:account': "계정 정보 변경"
-    'read:drive': "드라이브 보기"
-    'write:drive': "드라이브 수정"
+    "read:account": "계정 정보 보기"
+    "write:account": "계정 정보 변경"
+    "read: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: "당신"
@@ -665,6 +667,8 @@ common/views/components/user-list-editor.vue:
   remove-user: "이 리스트에서 제거"
   delete-are-you-sure: "리스트 \"$1\"을 삭제하시겠습니까?"
   deleted: "삭제하였습니다"
+common/views/components/user-lists.vue:
+  list-name: "리스트 이름"
 common/views/widgets/broadcast.vue:
   fetching: "확인중"
   no-broadcasts: "공지사항이 없습니다"
@@ -1013,8 +1017,6 @@ desktop/views/components/received-follow-requests-window.vue:
   reject: "거부"
 desktop/views/components/user-lists-window.vue:
   title: "리스트"
-  create-list: "리스트 만들기"
-  list-name: "리스트 이름"
 desktop/views/components/user-preview.vue:
   notes: "글"
   following: "팔로잉"
@@ -1404,8 +1406,6 @@ 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"
@@ -1462,7 +1462,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:
@@ -1483,9 +1483,12 @@ mobile/views/components/ui.nav.vue:
   game: "게임"
   admin: "관리"
   about: "Misskey에 대하여"
+mobile/views/pages/drive.vue:
+  contextmenu:
+    upload: "파일 업로드"
+    create-folder: "폴더 만들기"
 mobile/views/pages/user-lists.vue:
   title: "리스트"
-  enter-list-name: "리스트명을 입력하십시오"
 mobile/views/pages/signup.vue:
   lets-start: "📦 이제 시작해도 됩니다"
 mobile/views/pages/followers.vue:
@@ -1615,10 +1618,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"
@@ -401,7 +403,6 @@ desktop/views/components/ui.header.search.vue:
   placeholder: "Zoeken"
 desktop/views/components/user-lists-window.vue:
   title: "Lijsten"
-  create-list: "Lijst creëren"
 desktop/views/components/user-preview.vue:
   notes: "Berichten"
   following: "Volgend"
@@ -555,6 +556,10 @@ mobile/views/components/ui.nav.vue:
   user-lists: "Lijsten"
   game: "Othello spelen"
   about: "Over Misskey"
+mobile/views/pages/drive.vue:
+  contextmenu:
+    upload: "Bestand uploaden"
+    create-folder: "Map creëren"
 mobile/views/pages/user-lists.vue:
   title: "Lijsten"
 mobile/views/pages/home.vue:

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"
@@ -190,6 +192,8 @@ common/views/components/profile-editor.vue:
     user-lists: "Lister"
 common/views/components/user-list-editor.vue:
   users: "Bruker"
+common/views/components/user-lists.vue:
+  list-name: "Liste navn"
 common/views/widgets/broadcast.vue:
   fetching: "Henter"
   next: "Neste"
@@ -308,7 +312,6 @@ desktop/views/components/received-follow-requests-window.vue:
   reject: "Avslå"
 desktop/views/components/user-lists-window.vue:
   title: "Brukerlister"
-  list-name: "Liste navn"
 desktop/views/components/user-preview.vue:
   notes: "Innlegg"
   following: "Følger"

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:
@@ -511,6 +512,8 @@ common/views/components/user-list-editor.vue:
   remove-user: "Usuń z tej listy"
   delete-are-you-sure: "Usunąć listę \"$1\"?"
   deleted: "Usunięto"
+common/views/components/user-lists.vue:
+  list-name: "Nazwa listy"
 common/views/widgets/broadcast.vue:
   fetching: "Sprawdzanie"
   no-broadcasts: "Brak transmisji"
@@ -833,8 +836,6 @@ desktop/views/components/received-follow-requests-window.vue:
   reject: "Odmów"
 desktop/views/components/user-lists-window.vue:
   title: "Listy"
-  create-list: "Utwórz listę"
-  list-name: "Nazwa listy"
 desktop/views/components/user-preview.vue:
   notes: "Wpisy"
   following: "Śledzeni"
@@ -1025,8 +1026,6 @@ mobile/views/components/drive.vue:
   file-count: "Plik(i)"
   nothing-in-drive: "Pusto"
   folder-is-empty: "Ten katalog jest pusty"
-  prompt: "Co chcesz zrobić? (wprowadź odpowiednią cyfrę): <1 → Wysłać plik | 2 → Wysłać plik z adresu URL | 3 → Utworzyć katalog | 4 → Zmienić nazwę tego katalogu | 5 → Przenieść ten katalog | 6 → Usunąć ten katalog>"
-  deletion-alert: "Przepraszamy. Usuwanie katalogów nie zostało jeszcze zaimplementowane."
   folder-name: "Nazwa katalogu"
   url-prompt: "Adres URL pliku, który chcesz wysłać"
   uploading: "Rozpoczęto wysyłanie. Może to trochę potrwać."
@@ -1082,7 +1081,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:
@@ -1102,9 +1101,12 @@ mobile/views/components/ui.nav.vue:
   game: "Gry"
   admin: "Admin"
   about: "O Misskey"
+mobile/views/pages/drive.vue:
+  contextmenu:
+    upload: "Wyślij plik"
+    create-folder: "Utwórz katalog"
 mobile/views/pages/user-lists.vue:
   title: "Listy"
-  enter-list-name: "Wprowadź nazwę listy"
 mobile/views/pages/signup.vue:
   lets-start: "Rozpocznijmy! 📦"
 mobile/views/pages/home.vue:

locales/zh-CN.yml

@@ -34,6 +34,7 @@ common:
   signup: "注册"
   signout: "退出"
   reload-to-apply-the-setting: "必须重新加载页面以应用此设置。 确实要立即重新加载吗？"
+  fetching-as-ap-object: "联合查询"
   got-it: "知道了"
   customization-tips:
     title: "自定义提示"
@@ -70,10 +71,26 @@ common:
   followers: "关注者"
   favorites: "最爱"
   permissions:
-    'read:account': "查看账户信息"
-    'write:account': "更改我的帐户信息"
-    'read:drive': "查看网盘"
-    'write:drive': "管理网盘文件"
+    "read:account": "查看账户信息"
+    "write:account": "更改我的帐户信息"
+    "read:blocks": "查看黑名单"
+    "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 +146,7 @@ common:
     apps: "应用程序"
     tags: "标签"
     mute-and-block: "屏蔽/拉黑"
-    blocking: "屏蔽"
+    blocking: "拉黑"
     security: "安全性"
     signin: "登录历史"
     password: "密码"
@@ -146,7 +163,7 @@ common:
     keep-cw: "保留内容警告"
     keep-cw-desc: "在回复帖子时，如果原帖设置了内容警告，默认情况下回帖也会设置相同的内容警告。"
     i-like-sushi: "相比于布丁来说, 我更喜欢寿司。"
-    show-reversi-board-labels: "在 Reversi 中显示行和列表签"
+    show-reversi-board-labels: "在黑白棋中显示行和列表签"
     use-avatar-reversi-stones: "用头像作为黑白棋的棋子"
     disable-animated-mfm: "在帖子中禁用动画文本"
     disable-showing-animated-images: "不播放动画"
@@ -189,9 +206,9 @@ common:
     show-clock-on-header: "在右上角显示时钟"
     show-reply-target: "显示回复目标"
     timeline: "时间线"
-    show-my-renotes: "在时间线上显示我的Renote"
-    show-renoted-my-notes: "在时间线上显示我的帖子的Renote"
-    show-local-renotes: "在时间线上显示本地帖子的Renote"
+    show-my-renotes: "在时间线上显示我的转推"
+    show-renoted-my-notes: "在时间线上显示我的帖子的转推"
+    show-local-renotes: "在时间线上显示本地帖子的转推"
     remain-deleted-note: "继续显示已删除的帖子"
     sound: "声音"
     enable-sounds: "开启声音"
@@ -241,7 +258,7 @@ common:
   is-remote-user: "此用户信息可能不准确。"
   is-remote-post: "该投稿已被复制."
   view-on-remote: "查看准确的信息"
-  renoted-by: "由 {user} Renote"
+  renoted-by: "由 {user} 转推"
   no-notes: "没有帖子"
   turn-on-darkmode: "切换暗色主题"
   turn-off-darkmode: "切换亮色主题"
@@ -281,6 +298,7 @@ common:
     nav: "导航"
     tips: "提示"
     hashtags: "标签"
+    queue: "队列"
   dev: "构建应用程序失败，请再试一次。"
   ai-chan-kawaii: "小蓝真可爱"
   you: "您"
@@ -321,8 +339,8 @@ common/views/components/games/reversi/reversi.game.vue:
   surrender: "认输"
   surrendered: "已认输"
   is-llotheo: "棋子较少一方获胜(LLoTheO规则)"
-  looped-map: "环形棋盘"
-  can-put-everywhere: "可以下在任意放置"
+  looped-map: "循环棋盘"
+  can-put-everywhere: "可以下在任意位置"
 common/views/components/games/reversi/reversi.index.vue:
   title: "Misskey 黑白棋"
   sub-title: "和其他人一起来玩Misskey黑白棋"
@@ -346,8 +364,8 @@ common/views/components/games/reversi/reversi.room.vue:
   black-is: "{}是黑"
   rules: "规则"
   is-llotheo: "棋子较少一方获胜(LLoTheO规则)"
-  looped-map: "环形棋盘"
-  can-put-everywhere: "可以下在任意放置"
+  looped-map: "循环棋盘"
+  can-put-everywhere: "可以下在任意位置"
   settings-of-the-bot: "机器人设定"
   this-game-is-started-soon: "游戏即将在数秒后开始"
   waiting-for-other: "等待对手准备"
@@ -463,8 +481,8 @@ common/views/components/note-menu.vue:
   unfavorite: "取消收藏"
   watch: "关注"
   unwatch: "取消关注"
-  pin: "固定个人资料"
-  unpin: "解除固定"
+  pin: "置顶"
+  unpin: "取消置顶"
   delete: "删除"
   delete-confirm: "确定删除这个投稿吗?"
   remote: "显示原始投稿"
@@ -472,8 +490,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: "举报骚扰"
@@ -481,8 +503,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: "为\"{}\"投票"
   vote-count: "{}票"
@@ -665,6 +691,9 @@ common/views/components/user-list-editor.vue:
   remove-user: "从此列表中删除"
   delete-are-you-sure: "删除列表“$1”？"
   deleted: "已删除"
+common/views/components/user-lists.vue:
+  create-list: "创建列表"
+  list-name: "列表名称"
 common/views/widgets/broadcast.vue:
   fetching: "确认中"
   no-broadcasts: "没有公告"
@@ -707,7 +736,7 @@ common/views/widgets/tips.vue:
   tips-line8: "可以从设置中定制主页。"
   tips-line9: "Misskey 根据 AGPLv3 获得许可。"
   tips-line10: "使用Time Machine(时光机)小部件可以轻松追溯到过去的时间轴。"
-  tips-line11: "您可以点击“...”将帖子固定到用户页面"
+  tips-line11: "您可以点击“...”将帖子置顶到用户页面"
   tips-line13: "附在帖子上的所有文件都会保存到网盘中。"
   tips-line14: "在自定义首页布局时，您可以右键单击窗口小部件以更改其设计。"
   tips-line17: "用“**”围绕文本将突出显示它。"
@@ -742,7 +771,7 @@ desktop/views/components/activity.chart.vue:
   total: "黑 ... 总计"
   notes: "蓝 ... 投稿"
   replies: "红 ... 回复"
-  renotes: "绿 ... 转发"
+  renotes: "绿 ... 转推"
 desktop/views/components/activity.vue:
   title: "活动"
   toggle: "切换显示"
@@ -839,12 +868,12 @@ desktop/views/components/note-detail.vue:
   private: "私密投稿"
   deleted: "投稿已删除"
   location: "位置信息"
-  renote: "转发"
+  renote: "转推"
   add-reaction: "回应"
   undo-reaction: "取消回应"
 desktop/views/components/note.vue:
   reply: "回复"
-  renote: "Renote"
+  renote: "转推"
   add-reaction: "回应"
   undo-reaction: "取消回应"
   detail: "详细信息"
@@ -863,13 +892,13 @@ desktop/views/components/post-form.vue:
   quote-placeholder: "引用这个帖子…"
   submit: "投稿"
   reply: "回复"
-  renote: "转发"
+  renote: "转推"
   posted: "已发送投稿!"
   replied: "已回复!"
-  reposted: "已转发!"
+  reposted: "已转推!"
   note-failed: "发帖失败"
   reply-failed: "回复失败"
-  renote-failed: "转发失败"
+  renote-failed: "转推失败"
   posting: "发送中"
   attach-media-from-local: "从设备中添加媒体文件"
   attach-media-from-drive: "从网盘中添加媒体文件"
@@ -894,13 +923,13 @@ desktop/views/components/progress-dialog.vue:
 desktop/views/components/renote-form.vue:
   quote: "引用..."
   cancel: "取消"
-  renote: "重新发送"
-  renote-home: "重新发送(首页)"
+  renote: "转推"
+  renote-home: "转推(首页)"
   reposting: "重新发送中..."
-  success: "已重新发送！"
-  failure: "重新发送失败"
+  success: "已转推！"
+  failure: "转推失败"
 desktop/views/components/renote-form-window.vue:
-  title: "您是否要重新发送？"
+  title: "您是否要转推？"
 desktop/views/pages/user-following-or-followers.vue:
   following: "{user}的正在关注"
   followers: "{user}的关注者"
@@ -950,7 +979,7 @@ common/views/components/drive-settings.vue:
 common/views/components/mute-and-block.vue:
   mute-and-block: "屏蔽/拉黑"
   mute: "屏蔽"
-  block: "拉黑中"
+  block: "拉黑"
   no-muted-users: "无屏蔽用户"
   no-blocked-users: "无拉黑的用户"
   word-mute: "文字屏蔽"
@@ -966,6 +995,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:
@@ -1012,8 +1042,6 @@ desktop/views/components/received-follow-requests-window.vue:
   reject: "拒绝"
 desktop/views/components/user-lists-window.vue:
   title: "用户列表"
-  create-list: "创建列表"
-  list-name: "列表名称"
 desktop/views/components/user-preview.vue:
   notes: "帖子"
   following: "关注中"
@@ -1191,7 +1219,9 @@ admin/views/users.vue:
   unsuspend-confirm: "是否解除冻结？"
   unsuspended: "已成功解除用户冻结"
   make-silence: "禁言"
+  silence-confirm: "确认屏蔽？"
   unmake-silence: "解除禁言"
+  unsilence-confirm: "解除屏蔽？"
   verify: "认证用户"
   verify-confirm: "是否官方账号？"
   verified: "此账户已被认证"
@@ -1385,6 +1415,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: "点击来剪辑头像"
@@ -1403,12 +1434,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: "选择文件"
 mobile/views/components/drive-folder-chooser.vue:
@@ -1457,11 +1487,11 @@ mobile/views/components/post-form.vue:
   add-visible-user: "添加用户"
   submit: "帖子"
   reply: "回复"
-  renote: "Renote"
+  renote: "转推"
   quote-placeholder: "引用这个帖子t... (可选)"
   reply-placeholder: "回复这个帖子"
   cw-placeholder: "评论帖子（可选）"
-  location-alert: "您的设备不提供定位服务"
+  geolocation-alert: "您的设备不提供位置服务"
   error: "错误"
   username-prompt: "请输入用户名"
 mobile/views/components/sub-note-content.vue:
@@ -1482,9 +1512,16 @@ mobile/views/components/ui.nav.vue:
   game: "游戏"
   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: "您的账户现已准备就绪！ 📦"
 mobile/views/pages/followers.vue:
@@ -1581,7 +1618,7 @@ deck/deck.user-column.vue:
   images: "图片"
   activity: "活动"
   timeline: "时间线"
-  pinned-notes: "标记投稿"
+  pinned-notes: "置顶帖"
 docs:
   edit-this-page-on-github: "发现错误或想要为文档做出贡献？"
   edit-this-page-on-github-link: "在GitHub上编辑这个页面。"
@@ -1611,14 +1648,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-desc-ex: "ex) iOS版Misskey客户端."
+  app-overview-placeholder: " 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访问此处请求的功能。"

migration/1556348509290-Pages.ts

@@ -0,0 +1,31 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class Pages1556348509290 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`CREATE TYPE "page_visibility_enum" AS ENUM('public', 'followers', 'specified')`);
+        await queryRunner.query(`CREATE TABLE "page" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL, "title" character varying(256) NOT NULL, "name" character varying(256) NOT NULL, "summary" character varying(256), "alignCenter" boolean NOT NULL, "font" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, "eyeCatchingImageId" character varying(32), "content" jsonb NOT NULL DEFAULT '[]', "variables" jsonb NOT NULL DEFAULT '[]', "visibility" "page_visibility_enum" NOT NULL, "visibleUserIds" character varying(32) array NOT NULL DEFAULT '{}'::varchar[], CONSTRAINT "PK_742f4117e065c5b6ad21b37ba1f" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE INDEX "IDX_fbb4297c927a9b85e9cefa2eb1" ON "page" ("createdAt") `);
+        await queryRunner.query(`CREATE INDEX "IDX_af639b066dfbca78b01a920f8a" ON "page" ("updatedAt") `);
+        await queryRunner.query(`CREATE INDEX "IDX_b82c19c08afb292de4600d99e4" ON "page" ("name") `);
+        await queryRunner.query(`CREATE INDEX "IDX_ae1d917992dd0c9d9bbdad06c4" ON "page" ("userId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_90148bbc2bf0854428786bfc15" ON "page" ("visibleUserIds") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_2133ef8317e4bdb839c0dcbf13" ON "page" ("userId", "name") `);
+        await queryRunner.query(`ALTER TABLE "page" ADD CONSTRAINT "FK_ae1d917992dd0c9d9bbdad06c4a" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "page" ADD CONSTRAINT "FK_3126dd7c502c9e4d7597ef7ef10" FOREIGN KEY ("eyeCatchingImageId") REFERENCES "drive_file"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "page" DROP CONSTRAINT "FK_3126dd7c502c9e4d7597ef7ef10"`);
+        await queryRunner.query(`ALTER TABLE "page" DROP CONSTRAINT "FK_ae1d917992dd0c9d9bbdad06c4a"`);
+        await queryRunner.query(`DROP INDEX "IDX_2133ef8317e4bdb839c0dcbf13"`);
+        await queryRunner.query(`DROP INDEX "IDX_90148bbc2bf0854428786bfc15"`);
+        await queryRunner.query(`DROP INDEX "IDX_ae1d917992dd0c9d9bbdad06c4"`);
+        await queryRunner.query(`DROP INDEX "IDX_b82c19c08afb292de4600d99e4"`);
+        await queryRunner.query(`DROP INDEX "IDX_af639b066dfbca78b01a920f8a"`);
+        await queryRunner.query(`DROP INDEX "IDX_fbb4297c927a9b85e9cefa2eb1"`);
+        await queryRunner.query(`DROP TABLE "page"`);
+        await queryRunner.query(`DROP TYPE "page_visibility_enum"`);
+    }
+
+}

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.0.2",
+	"version": "11.5.0",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",
@@ -23,20 +23,19 @@
 		"format": "gulp format"
 	},
 	"dependencies": {
+		"@elastic/elasticsearch": "7.0.0-rc.2",
 		"@fortawesome/fontawesome-svg-core": "1.2.15",
 		"@fortawesome/free-brands-svg-icons": "5.7.2",
 		"@fortawesome/free-regular-svg-icons": "5.7.2",
 		"@fortawesome/free-solid-svg-icons": "5.7.2",
 		"@fortawesome/vue-fontawesome": "0.1.5",
 		"@koa/cors": "2.2.3",
-		"@prezzemolo/rap": "0.1.2",
 		"@prezzemolo/zip": "0.0.3",
 		"@types/bcryptjs": "2.4.2",
 		"@types/bull": "3.5.11",
 		"@types/dateformat": "3.0.0",
 		"@types/deep-equal": "1.0.1",
 		"@types/double-ended-queue": "2.1.0",
-		"@types/elasticsearch": "5.0.32",
 		"@types/file-type": "10.9.1",
 		"@types/gulp": "4.0.6",
 		"@types/gulp-mocha": "0.0.32",
@@ -64,8 +63,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 +72,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",
@@ -95,13 +93,13 @@
 		"@types/websocket": "0.0.40",
 		"@types/ws": "6.0.1",
 		"animejs": "3.0.1",
-		"apexcharts": "3.6.7",
+		"apexcharts": "3.6.9",
 		"autobind-decorator": "2.4.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
 		"bcryptjs": "2.4.3",
 		"bootstrap-vue": "2.0.0-rc.13",
-		"bull": "3.7.0",
+		"bull": "3.8.1",
 		"cafy": "15.1.1",
 		"chai": "4.2.0",
 		"chalk": "2.4.2",
@@ -113,9 +111,8 @@
 		"cssnano": "4.1.10",
 		"dateformat": "3.0.3",
 		"deep-equal": "1.0.1",
-		"diskusage": "1.0.0",
+		"diskusage": "1.1.0",
 		"double-ended-queue": "2.1.0-0",
-		"elasticsearch": "15.4.1",
 		"emojilib": "2.4.0",
 		"eslint": "5.16.0",
 		"eslint-plugin-vue": "5.2.2",
@@ -123,7 +120,7 @@
 		"feed": "2.0.4",
 		"file-type": "10.11.0",
 		"fuckadblock": "3.2.1",
-		"gulp": "4.0.0",
+		"gulp": "4.0.1",
 		"gulp-cssnano": "2.1.3",
 		"gulp-imagemin": "5.0.3",
 		"gulp-mocha": "6.0.0",
@@ -139,10 +136,10 @@
 		"html-minifier": "4.0.0",
 		"http-signature": "1.2.0",
 		"insert-text-at-cursor": "0.2.0",
-		"is-root": "2.0.0",
+		"is-root": "2.1.0",
 		"is-svg": "4.1.0",
 		"js-yaml": "3.13.1",
-		"jsdom": "14.0.0",
+		"jsdom": "15.0.0",
 		"json5": "2.1.0",
 		"json5-loader": "2.0.0",
 		"katex": "0.10.1",
@@ -162,22 +159,20 @@
 		"loader-utils": "1.2.3",
 		"lolex": "3.1.0",
 		"lookup-dns-cache": "2.1.0",
-		"minio": "7.0.5",
+		"minio": "7.0.7",
 		"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",
-		"nodemailer": "6.1.0",
+		"nodemailer": "6.1.1",
 		"nprogress": "0.2.0",
 		"object-assign-deep": "0.4.0",
 		"os-utils": "0.0.14",
 		"parse5": "5.1.0",
 		"parsimmon": "1.12.0",
-		"pg": "7.9.0",
+		"pg": "7.10.0",
 		"portscanner": "2.2.0",
 		"postcss-loader": "3.0.0",
 		"prismjs": "1.16.0",
@@ -187,7 +182,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",
@@ -202,7 +199,8 @@
 		"rimraf": "2.6.3",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
-		"sharp": "0.22.0",
+		"seedrandom": "3.0.1",
+		"sharp": "0.22.1",
 		"showdown": "1.9.0",
 		"showdown-highlightjs-extension": "0.1.2",
 		"speakeasy": "2.0.0",
@@ -211,7 +209,7 @@
 		"stylus": "0.54.5",
 		"stylus-loader": "3.0.2",
 		"summaly": "2.2.0",
-		"systeminformation": "4.1.4",
+		"systeminformation": "4.1.6",
 		"syuilo-password-strength": "0.0.1",
 		"terser-webpack-plugin": "1.2.3",
 		"textarea-caret": "3.1.0",
@@ -235,13 +233,13 @@
 		"vue-color": "2.7.0",
 		"vue-content-loading": "1.6.0",
 		"vue-cropperjs": "3.0.0",
-		"vue-i18n": "8.10.0",
+		"vue-i18n": "8.11.1",
 		"vue-js-modal": "1.3.28",
 		"vue-json-pretty": "1.6.0",
 		"vue-loader": "15.7.0",
 		"vue-marquee-text-component": "1.1.1",
 		"vue-prism-component": "1.1.1",
-		"vue-router": "3.0.4",
+		"vue-router": "3.0.6",
 		"vue-sequential-entrance": "1.1.3",
 		"vue-style-loader": "4.1.2",
 		"vue-svg-inline-loader": "1.2.15",

src/boot/master.ts

@@ -27,7 +27,7 @@ function greet() {
 		console.log(' ' + chalk.gray(v) + ('                        |___|\n'.substr(v.length)));
 		//#endregion
 
-		console.log(' Misskey is maintained by @syuilo, @AyaMorisawa, @mei23, and @acid-chicken.');
+		console.log(' Misskey is maintained by @syuilo, @AyaMorisawa, @mei23, @acid-chicken, and @rinsuki.');
 		console.log(chalk.keyword('orange')(' If you like Misskey, please donate to support development. https://www.patreon.com/syuilo'));
 
 		console.log('');

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

@@ -9,6 +9,9 @@
 			<ui-textarea v-model="announcement.text">
 				<span>{{ $t('text') }}</span>
 			</ui-textarea>
+			<ui-input v-model="announcement.image">
+				<span>{{ $t('image-url') }}</span>
+			</ui-input>
 			<ui-horizon-group class="fit-bottom">
 				<ui-button @click="save()"><fa :icon="['far', 'save']"/> {{ $t('save') }}</ui-button>
 				<ui-button @click="remove(i)"><fa :icon="['far', 'trash-alt']"/> {{ $t('remove') }}</ui-button>
@@ -43,7 +46,8 @@ export default Vue.extend({
 		add() {
 			this.announcements.unshift({
 				title: '',
-				text: ''
+				text: '',
+				image: null
 			});
 		},
 

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/aiscript.ts

@@ -0,0 +1,470 @@
+/**
+ * AiScript
+ * evaluator & type checker
+ */
+
+import autobind from 'autobind-decorator';
+import * as seedrandom from 'seedrandom';
+
+import {
+	faSuperscript,
+	faAlignLeft,
+	faShareAlt,
+	faSquareRootAlt,
+	faPlus,
+	faMinus,
+	faTimes,
+	faDivide,
+	faList,
+	faQuoteRight,
+	faEquals,
+	faGreaterThan,
+	faLessThan,
+	faGreaterThanEqual,
+	faLessThanEqual,
+	faExclamation,
+	faNotEqual,
+	faDice,
+	faSortNumericUp,
+} from '@fortawesome/free-solid-svg-icons';
+import { faFlag } from '@fortawesome/free-regular-svg-icons';
+
+import { version } from '../../config';
+
+export type Block = {
+	id: string;
+	type: string;
+	args: Block[];
+	value: any;
+};
+
+export type Variable = Block & {
+	name: string;
+};
+
+type Type = 'string' | 'number' | 'boolean' | 'stringArray';
+
+type TypeError = {
+	arg: number;
+	expect: Type;
+	actual: Type;
+};
+
+const funcDefs = {
+	if:              { in: ['boolean', 0, 0],      out: 0,         category: 'flow',       icon: faShareAlt, },
+	not:             { in: ['boolean'],            out: 'boolean', category: 'logical',    icon: faFlag, },
+	or:              { in: ['boolean', 'boolean'], out: 'boolean', category: 'logical',    icon: faFlag, },
+	and:             { in: ['boolean', 'boolean'], out: 'boolean', category: 'logical',    icon: faFlag, },
+	add:             { in: ['number', 'number'],   out: 'number',  category: 'operation',  icon: faPlus, },
+	subtract:        { in: ['number', 'number'],   out: 'number',  category: 'operation',  icon: faMinus, },
+	multiply:        { in: ['number', 'number'],   out: 'number',  category: 'operation',  icon: faTimes, },
+	divide:          { in: ['number', 'number'],   out: 'number',  category: 'operation',  icon: faDivide, },
+	eq:              { in: [0, 0],                 out: 'boolean', category: 'comparison', icon: faEquals, },
+	notEq:           { in: [0, 0],                 out: 'boolean', category: 'comparison', icon: faNotEqual, },
+	gt:              { in: ['number', 'number'],   out: 'boolean', category: 'comparison', icon: faGreaterThan, },
+	lt:              { in: ['number', 'number'],   out: 'boolean', category: 'comparison', icon: faLessThan, },
+	gtEq:            { in: ['number', 'number'],   out: 'boolean', category: 'comparison', icon: faGreaterThanEqual, },
+	ltEq:            { in: ['number', 'number'],   out: 'boolean', category: 'comparison', icon: faLessThanEqual, },
+	rannum:          { in: ['number', 'number'],   out: 'number',  category: 'random',     icon: faDice, },
+	random:          { in: ['number'],             out: 'boolean', category: 'random',     icon: faDice, },
+	randomPick:      { in: [0],                    out: 0,         category: 'random',     icon: faDice, },
+	dailyRannum:     { in: ['number', 'number'],   out: 'number',  category: 'random',     icon: faDice, },
+	dailyRandom:     { in: ['number'],             out: 'boolean', category: 'random',     icon: faDice, },
+	dailyRandomPick: { in: [0],                    out: 0,         category: 'random',     icon: faDice, },
+};
+
+const blockDefs = [
+	{ type: 'text',          out: 'string',      category: 'value', icon: faQuoteRight, },
+	{ type: 'multiLineText', out: 'string',      category: 'value', icon: faAlignLeft, },
+	{ type: 'textList',      out: 'stringArray', category: 'value', icon: faList, },
+	{ type: 'number',        out: 'number',      category: 'value', icon: faSortNumericUp, },
+	{ type: 'ref',           out: null,          category: 'value', icon: faSuperscript, },
+	{ type: 'in',            out: null,          category: 'value', icon: faSuperscript, },
+	{ type: 'fn',            out: 'function',    category: 'value', icon: faSuperscript, },
+	...Object.entries(funcDefs).map(([k, v]) => ({
+		type: k, out: v.out || null, category: v.category, icon: v.icon
+	}))
+];
+
+type PageVar = { name: string; value: any; type: Type; };
+
+const envVarsDef = {
+	AI: 'string',
+	VERSION: 'string',
+	LOGIN: 'boolean',
+	NAME: 'string',
+	USERNAME: 'string',
+	USERID: 'string',
+	NOTES_COUNT: 'number',
+	FOLLOWERS_COUNT: 'number',
+	FOLLOWING_COUNT: 'number',
+	IS_CAT: 'boolean',
+	MY_NOTES_COUNT: 'number',
+	MY_FOLLOWERS_COUNT: 'number',
+	MY_FOLLOWING_COUNT: 'number',
+};
+
+export class AiScript {
+	private variables: Variable[];
+	private pageVars: PageVar[];
+	private envVars: Record<keyof typeof envVarsDef, any>;
+
+	public static envVarsDef = envVarsDef;
+	public static blockDefs = blockDefs;
+	public static funcDefs = funcDefs;
+	private opts: {
+		randomSeed?: string; user?: any; visitor?: any;
+	};
+
+	constructor(variables: Variable[] = [], pageVars: PageVar[] = [], opts: AiScript['opts'] = {}) {
+		this.variables = variables;
+		this.pageVars = pageVars;
+		this.opts = opts;
+
+		this.envVars = {
+			AI: 'kawaii',
+			VERSION: version,
+			LOGIN: opts.visitor != null,
+			NAME: opts.visitor ? opts.visitor.name : '',
+			USERNAME: opts.visitor ? opts.visitor.username : '',
+			USERID: opts.visitor ? opts.visitor.id : '',
+			NOTES_COUNT: opts.visitor ? opts.visitor.notesCount : 0,
+			FOLLOWERS_COUNT: opts.visitor ? opts.visitor.followersCount : 0,
+			FOLLOWING_COUNT: opts.visitor ? opts.visitor.followingCount : 0,
+			IS_CAT: opts.visitor ? opts.visitor.isCat : false,
+			MY_NOTES_COUNT: opts.user ? opts.user.notesCount : 0,
+			MY_FOLLOWERS_COUNT: opts.user ? opts.user.followersCount : 0,
+			MY_FOLLOWING_COUNT: opts.user ? opts.user.followingCount : 0,
+		};
+	}
+
+	@autobind
+	public injectVars(vars: Variable[]) {
+		this.variables = vars;
+	}
+
+	@autobind
+	public injectPageVars(pageVars: PageVar[]) {
+		this.pageVars = pageVars;
+	}
+
+	@autobind
+	public updatePageVar(name: string, value: any) {
+		this.pageVars.find(v => v.name === name).value = value;
+	}
+
+	@autobind
+	public updateRandomSeed(seed: string) {
+		this.opts.randomSeed = seed;
+	}
+
+	@autobind
+	public static isLiteralBlock(v: Block) {
+		if (v.type === null) return true;
+		if (v.type === 'text') return true;
+		if (v.type === 'multiLineText') return true;
+		if (v.type === 'textList') return true;
+		if (v.type === 'number') return true;
+		if (v.type === 'ref') return true;
+		if (v.type === 'fn') return true;
+		if (v.type === 'in') return true;
+		return false;
+	}
+
+	@autobind
+	public typeCheck(v: Block): TypeError | null {
+		if (AiScript.isLiteralBlock(v)) return null;
+
+		const def = AiScript.funcDefs[v.type];
+		if (def == null) {
+			throw new Error('Unknown type: ' + v.type);
+		}
+
+		const generic: Type[] = [];
+
+		for (let i = 0; i < def.in.length; i++) {
+			const arg = def.in[i];
+			const type = this.typeInference(v.args[i]);
+			if (type === null) continue;
+
+			if (typeof arg === 'number') {
+				if (generic[arg] === undefined) {
+					generic[arg] = type;
+				} else if (type !== generic[arg]) {
+					return {
+						arg: i,
+						expect: generic[arg],
+						actual: type
+					};
+				}
+			} else if (type !== arg) {
+				return {
+					arg: i,
+					expect: arg,
+					actual: type
+				};
+			}
+		}
+
+		return null;
+	}
+
+	@autobind
+	public getExpectedType(v: Block, slot: number): Type | null {
+		const def = AiScript.funcDefs[v.type];
+		if (def == null) {
+			throw new Error('Unknown type: ' + v.type);
+		}
+
+		const generic: Type[] = [];
+
+		for (let i = 0; i < def.in.length; i++) {
+			const arg = def.in[i];
+			const type = this.typeInference(v.args[i]);
+			if (type === null) continue;
+
+			if (typeof arg === 'number') {
+				if (generic[arg] === undefined) {
+					generic[arg] = type;
+				}
+			}
+		}
+
+		if (typeof def.in[slot] === 'number') {
+			return generic[def.in[slot]] || null;
+		} else {
+			return def.in[slot];
+		}
+	}
+
+	@autobind
+	public typeInference(v: Block): Type | null {
+		if (v.type === null) return null;
+		if (v.type === 'text') return 'string';
+		if (v.type === 'multiLineText') return 'string';
+		if (v.type === 'textList') return 'stringArray';
+		if (v.type === 'number') return 'number';
+		if (v.type === 'ref') {
+			const variable = this.variables.find(va => va.name === v.value);
+			if (variable) {
+				return this.typeInference(variable);
+			}
+
+			const pageVar = this.pageVars.find(va => va.name === v.value);
+			if (pageVar) {
+				return pageVar.type;
+			}
+
+			const envVar = AiScript.envVarsDef[v.value];
+			if (envVar) {
+				return envVar;
+			}
+
+			return null;
+		}
+		if (v.type === 'fn') return null; // todo
+		if (v.type === 'in') return null; // todo
+
+		const generic: Type[] = [];
+
+		const def = AiScript.funcDefs[v.type];
+
+		for (let i = 0; i < def.in.length; i++) {
+			const arg = def.in[i];
+			if (typeof arg === 'number') {
+				const type = this.typeInference(v.args[i]);
+
+				if (generic[arg] === undefined) {
+					generic[arg] = type;
+				} else {
+					if (type !== generic[arg]) {
+						generic[arg] = null;
+					}
+				}
+			}
+		}
+
+		if (typeof def.out === 'number') {
+			return generic[def.out];
+		} else {
+			return def.out;
+		}
+	}
+
+	@autobind
+	public getVarsByType(type: Type | null): Variable[] {
+		if (type == null) return this.variables;
+		return this.variables.filter(x => (this.typeInference(x) === null) || (this.typeInference(x) === type));
+	}
+
+	@autobind
+	public getVarByName(name: string): Variable {
+		return this.variables.find(x => x.name === name);
+	}
+
+	@autobind
+	public getEnvVarsByType(type: Type | null): string[] {
+		if (type == null) return Object.keys(AiScript.envVarsDef);
+		return Object.entries(AiScript.envVarsDef).filter(([k, v]) => type === v).map(([k, v]) => k);
+	}
+
+	@autobind
+	public getPageVarsByType(type: Type | null): string[] {
+		if (type == null) return this.pageVars.map(v => v.name);
+		return this.pageVars.filter(v => type === v.type).map(v => v.name);
+	}
+
+	@autobind
+	private interpolate(str: string, values: { name: string, value: any }[]) {
+		return str.replace(/\{(.+?)\}/g, match =>
+			(this.getVariableValue(match.slice(1, -1).trim(), values) || '').toString());
+	}
+
+	@autobind
+	public evaluateVars() {
+		const values: { name: string, value: any }[] = [];
+
+		for (const v of this.variables) {
+			values.push({
+				name: v.name,
+				value: this.evaluate(v, values)
+			});
+		}
+
+		for (const v of this.pageVars) {
+			values.push({
+				name: v.name,
+				value: v.value
+			});
+		}
+
+		for (const [k, v] of Object.entries(this.envVars)) {
+			values.push({
+				name: k,
+				value: v
+			});
+		}
+
+		return values;
+	}
+
+	@autobind
+	private evaluate(block: Block, values: { name: string, value: any }[], slotArg: Record<string, any> = {}): any {
+		if (block.type === null) {
+			return null;
+		}
+
+		if (block.type === 'number') {
+			return parseInt(block.value, 10);
+		}
+
+		if (block.type === 'text' || block.type === 'multiLineText') {
+			return this.interpolate(block.value, values);
+		}
+
+		if (block.type === 'textList') {
+			return block.value.trim().split('\n');
+		}
+
+		if (block.type === 'ref') {
+			return this.getVariableValue(block.value, values);
+		}
+
+		if (block.type === 'in') {
+			return slotArg[block.value];
+		}
+
+		if (block.type === 'fn') { // ユーザー関数定義
+			return {
+				slots: block.value.slots,
+				exec: slotArg => this.evaluate(block.value.expression, values, slotArg)
+			};
+		}
+
+		if (block.type.startsWith('fn:')) { // ユーザー関数呼び出し
+			const fnName = block.type.split(':')[1];
+			const fn = this.getVariableValue(fnName, values);
+			for (let i = 0; i < fn.slots.length; i++) {
+				const name = fn.slots[i];
+				slotArg[name] = this.evaluate(block.args[i], values);
+			}
+			return fn.exec(slotArg);
+		}
+
+		if (block.args === undefined) return null;
+
+		const date = new Date();
+		const day = `${this.opts.visitor ? this.opts.visitor.id : ''} ${date.getFullYear()}/${date.getMonth()}/${date.getDate()}`;
+
+		const funcs: { [p in keyof typeof funcDefs]: any } = {
+			not: (a) => !a,
+			eq: (a, b) => a === b,
+			notEq: (a, b) => a !== b,
+			gt: (a, b) => a > b,
+			lt: (a, b) => a < b,
+			gtEq: (a, b) => a >= b,
+			ltEq: (a, b) => a <= b,
+			or: (a, b) => a || b,
+			and: (a, b) => a && b,
+			if: (bool, a, b) => bool ? a : b,
+			add: (a, b) => a + b,
+			subtract: (a, b) => a - b,
+			multiply: (a, b) => a * b,
+			divide: (a, b) => a / b,
+			random: (probability) => Math.floor(seedrandom(`${this.opts.randomSeed}:${block.id}`)() * 100) < probability,
+			rannum: (min, max) => min + Math.floor(seedrandom(`${this.opts.randomSeed}:${block.id}`)() * (max - min + 1)),
+			randomPick: (list) => list[Math.floor(seedrandom(`${this.opts.randomSeed}:${block.id}`)() * list.length)],
+			dailyRandom: (probability) => Math.floor(seedrandom(`${day}:${block.id}`)() * 100) < probability,
+			dailyRannum: (min, max) => min + Math.floor(seedrandom(`${day}:${block.id}`)() * (max - min + 1)),
+			dailyRandomPick: (list) => list[Math.floor(seedrandom(`${day}:${block.id}`)() * list.length)],
+		};
+
+		const fnName = block.type;
+
+		const fn = funcs[fnName];
+		if (fn == null) {
+			console.error('Unknown function: ' + fnName);
+			throw new Error('Unknown function: ' + fnName);
+		}
+
+		const args = block.args.map(x => this.evaluate(x, values, slotArg));
+
+		return fn(...args);
+	}
+
+	@autobind
+	private getVariableValue(name: string, values: { name: string, value: any }[]): any {
+		const v = values.find(v => v.name === name);
+		if (v) {
+			return v.value;
+		}
+
+		const pageVar = this.pageVars.find(v => v.name === name);
+		if (pageVar) {
+			return pageVar.value;
+		}
+
+		if (AiScript.envVarsDef[name]) {
+			return this.envVars[name].value;
+		}
+
+		throw new Error(`Script: No such variable '${name}'`);
+	}
+
+	@autobind
+	public isUsedName(name: string) {
+		if (this.variables.some(v => v.name === name)) {
+			return true;
+		}
+
+		if (this.pageVars.some(v => v.name === name)) {
+			return true;
+		}
+
+		if (AiScript.envVarsDef[name]) {
+			return true;
+		}
+
+		return false;
+	}
+}

src/client/app/common/scripts/collect-page-vars.ts

@@ -0,0 +1,24 @@
+export function collectPageVars(content) {
+	const pageVars = [];
+	const collect = (xs: any[]) => {
+		for (const x of xs) {
+			if (x.type === 'input') {
+				pageVars.push({
+					name: x.name,
+					type: x.inputType,
+					value: x.default
+				});
+			} else if (x.type === 'switch') {
+				pageVars.push({
+					name: x.name,
+					type: 'boolean',
+					value: x.default
+				});
+			} else if (x.children) {
+				collect(x.children);
+			}
+		}
+	};
+	collect(content);
+	return pageVars;
+}

src/client/app/common/scripts/gen-search-query.ts

@@ -0,0 +1,31 @@
+import parseAcct from '../../../../misc/acct/parse';
+import { host as localHost } from '../../config';
+
+export async function genSearchQuery(v: any, q: string) {
+	let host: string;
+	let userId: string;
+	if (q.split(' ').some(x => x.startsWith('@'))) {
+		for (const at of q.split(' ').filter(x => x.startsWith('@')).map(x => x.substr(1))) {
+			if (at.includes('.')) {
+				if (at === localHost || at === '.') {
+					host = null;
+				} else {
+					host = at;
+				}
+			} else {
+				const user = await v.$root.api('users/show', parseAcct(at)).catch(x => null);
+				if (user) {
+					userId = user.id;
+				} else {
+					// todo: show error
+				}
+			}
+		}
+
+	}
+	return {
+		query: q.split(' ').filter(x => !x.startsWith('/') && !x.startsWith('@')).join(' '),
+		host: host,
+		userId: userId
+	};
+}

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('@') && !q.includes(' ')) {
+		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/avatar.vue

@@ -78,6 +78,7 @@ export default Vue.extend({
 .mk-avatar
 	display inline-block
 	vertical-align bottom
+	flex-shrink 0
 
 	&:not(.cat)
 		overflow hidden

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

@@ -6,16 +6,33 @@
 			<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>
 			<ui-input v-if="user" v-model="userInputValue" autofocus @keydown="onInputKeydown"><template #prefix>@</template></ui-input>
 			<ui-select v-if="select" v-model="selectedValue" autofocus>
+				<template v-if="select.items">
 					<option v-for="item in select.items" :value="item.value">{{ item.text }}</option>
+				</template>
+				<template v-else>
+					<optgroup v-for="groupedItem in select.groupedItems" :label="groupedItem.label">
+						<option v-for="item in groupedItem.items" :value="item.value">{{ item.text }}</option>
+					</optgroup>
+				</template>
 			</ui-select>
-			<ui-horizon-group no-grow class="buttons fit-bottom" v-if="!splash">
-				<ui-button @click="ok" primary :autofocus="!input && !select && !user">{{ (showCancelButton || input || select || user) ? $t('@.ok') : $t('@.got-it') }}</ui-button>
+			<ui-horizon-group no-grow class="buttons fit-bottom" v-if="!splash && (showOkButton || showCancelButton)">
+				<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 +72,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 +97,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 +130,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 +175,9 @@ export default Vue.extend({
 		},
 
 		onBgClick() {
+			if (this.cancelableByBgClick) {
 				this.cancel();
+			}
 		},
 
 		onInputKeydown(e) {
@@ -183,9 +204,6 @@ export default Vue.extend({
 	height 100%
 
 	&.splash
-		&, *
-			pointer-events none !important
-
 		> .main
 			min-width 0
 			width initial
@@ -219,7 +237,7 @@ export default Vue.extend({
 			font-size 32px
 
 			&.success
-				color #37ec92
+				color #85da5a
 
 			&.error
 				color #ec4137
@@ -243,7 +261,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/media-image.vue

@@ -36,7 +36,7 @@ export default Vue.extend({
 		return {
 			hide: true
 		};
-	}
+	},
 	computed: {
 		style(): any {
 			let url = `url(${

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/messaging.vue

@@ -13,8 +13,8 @@
 					@click="navigate(user)"
 					tabindex="-1"
 				>
-					<mk-avatar class="avatar" :user="user"/>
-					<span class="name"><mk-user-name :user="user"/></span>
+					<mk-avatar class="avatar" :user="user" :key="user.id"/>
+					<span class="name"><mk-user-name :user="user" :key="user.id"/></span>
 					<span class="username">@{{ user | acct }}</span>
 				</li>
 			</ol>

src/client/app/common/views/components/page-editor/page-editor.block.vue

@@ -0,0 +1,25 @@
+<template>
+<component :is="'x-' + value.type" :value="value" @input="v => updateItem(v)" @remove="() => $emit('remove', value)" :key="value.id"/>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import XSection from './page-editor.section.vue';
+import XText from './page-editor.text.vue';
+import XImage from './page-editor.image.vue';
+import XButton from './page-editor.button.vue';
+import XInput from './page-editor.input.vue';
+import XSwitch from './page-editor.switch.vue';
+
+export default Vue.extend({
+	components: {
+		XSection, XText, XImage, XButton, XInput, XSwitch
+	},
+
+	props: {
+		value: {
+			required: true
+		}
+	},
+});
+</script>

src/client/app/common/views/components/page-editor/page-editor.button.vue

@@ -0,0 +1,54 @@
+<template>
+<x-container @remove="() => $emit('remove')">
+	<template #header><fa :icon="faBolt"/> {{ $t('blocks.button') }}</template>
+
+	<section class="xfhsjczc">
+		<ui-input v-model="value.text"><span>{{ $t('blocks._button.text') }}</span></ui-input>
+		<ui-select v-model="value.action">
+			<template #label>{{ $t('blocks._button.action') }}</template>
+			<option value="dialog">{{ $t('blocks._button._action.dialog') }}</option>
+			<option value="resetRandom">{{ $t('blocks._button._action.resetRandom') }}</option>
+		</ui-select>
+		<ui-input v-if="value.action === 'dialog'" v-model="value.content"><span>{{ $t('blocks._button._action._dialog.content') }}</span></ui-input>
+	</section>
+</x-container>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../../i18n';
+import { faBolt } from '@fortawesome/free-solid-svg-icons';
+import XContainer from './page-editor.container.vue';
+
+export default Vue.extend({
+	i18n: i18n('pages'),
+
+	components: {
+		XContainer
+	},
+
+	props: {
+		value: {
+			required: true
+		},
+	},
+
+	data() {
+		return {
+			faBolt
+		};
+	},
+
+	created() {
+		if (this.value.text == null) Vue.set(this.value, 'text', '');
+		if (this.value.action == null) Vue.set(this.value, 'action', 'dialog');
+		if (this.value.content == null) Vue.set(this.value, 'content', null);
+	},
+});
+</script>
+
+<style lang="stylus" scoped>
+.xfhsjczc
+	padding 0 16px 0 16px
+
+</style>

src/client/app/common/views/components/page-editor/page-editor.container.vue

@@ -0,0 +1,135 @@
+<template>
+<div class="cpjygsrt" :class="{ error: error != null, warn: warn != null }">
+	<header>
+		<div class="title"><slot name="header"></slot></div>
+		<div class="buttons">
+			<slot name="func"></slot>
+			<button v-if="removable" @click="remove()">
+				<fa :icon="faTrashAlt"/>
+			</button>
+			<button @click="toggleContent(!showBody)">
+				<template v-if="showBody"><fa icon="angle-up"/></template>
+				<template v-else><fa icon="angle-down"/></template>
+			</button>
+		</div>
+	</header>
+	<p v-show="showBody" class="error" v-if="error != null">{{ $t('script.typeError', { slot: error.arg + 1, expect: $t(`script.types.${error.expect}`), actual: $t(`script.types.${error.actual}`) }) }}</p>
+	<p v-show="showBody" class="warn" v-if="warn != null">{{ $t('script.thereIsEmptySlot', { slot: warn.slot + 1 }) }}</p>
+	<div v-show="showBody">
+		<slot></slot>
+	</div>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import { faTrashAlt } from '@fortawesome/free-regular-svg-icons';
+import i18n from '../../../../i18n';
+
+export default Vue.extend({
+	i18n: i18n('pages'),
+
+	props: {
+		expanded: {
+			type: Boolean,
+			default: true
+		},
+		removable: {
+			type: Boolean,
+			default: true
+		},
+		error: {
+			required: false,
+			default: null
+		},
+		warn: {
+			required: false,
+			default: null
+		}
+	},
+	data() {
+		return {
+			showBody: this.expanded,
+			faTrashAlt
+		};
+	},
+	methods: {
+		toggleContent(show: boolean) {
+			this.showBody = show;
+			this.$emit('toggle', show);
+		},
+		remove() {
+			this.$emit('remove');
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.cpjygsrt
+	overflow hidden
+	background var(--face)
+	border solid 2px var(--pageBlockBorder)
+	border-radius 6px
+
+	&:hover
+		border solid 2px var(--pageBlockBorderHover)
+
+	&.warn
+		border solid 2px #dec44c
+
+	&.error
+		border solid 2px #f00
+
+	& + .cpjygsrt
+		margin-top 16px
+
+	> header
+		> .title
+			z-index 1
+			margin 0
+			padding 0 16px
+			line-height 42px
+			font-size 0.9em
+			font-weight bold
+			color var(--faceHeaderText)
+			box-shadow 0 1px rgba(#000, 0.07)
+
+			> [data-icon]
+				margin-right 6px
+
+			&:empty
+				display none
+
+		> .buttons
+			position absolute
+			z-index 2
+			top 0
+			right 0
+
+			> button
+				padding 0
+				width 42px
+				font-size 0.9em
+				line-height 42px
+				color var(--faceTextButton)
+
+				&:hover
+					color var(--faceTextButtonHover)
+
+				&:active
+					color var(--faceTextButtonActive)
+
+	> .warn
+		color #b19e49
+		margin 0
+		padding 16px 16px 0 16px
+		font-size 14px
+
+	> .error
+		color #f00
+		margin 0
+		padding 16px 16px 0 16px
+		font-size 14px
+
+</style>

src/client/app/common/views/components/page-editor/page-editor.image.vue

@@ -0,0 +1,78 @@
+<template>
+<x-container @remove="() => $emit('remove')">
+	<template #header><fa :icon="faImage"/> {{ $t('blocks.image') }}</template>
+	<template #func>
+		<button @click="choose()">
+			<fa :icon="faFolderOpen"/>
+		</button>
+	</template>
+
+	<section class="oyyftmcf">
+		<x-file-thumbnail class="preview" v-if="file" :file="file" :detail="true" fit="contain" @click="choose()"/>
+	</section>
+</x-container>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../../i18n';
+import { faPencilAlt } from '@fortawesome/free-solid-svg-icons';
+import { faImage, faFolderOpen } from '@fortawesome/free-regular-svg-icons';
+import XContainer from './page-editor.container.vue';
+import XFileThumbnail from '../drive-file-thumbnail.vue';
+
+export default Vue.extend({
+	i18n: i18n('pages'),
+
+	components: {
+		XContainer, XFileThumbnail
+	},
+
+	props: {
+		value: {
+			required: true
+		},
+	},
+
+	data() {
+		return {
+			file: null,
+			faPencilAlt, faImage, faFolderOpen
+		};
+	},
+
+	created() {
+		if (this.value.fileId === undefined) Vue.set(this.value, 'fileId', null);
+	},
+
+	mounted() {
+		if (this.value.fileId == null) {
+			this.choose();
+		} else {
+			this.$root.api('drive/files/show', {
+				fileId: this.value.fileId
+			}).then(file => {
+				this.file = file;
+			});
+		}
+	},
+
+	methods: {
+		async choose() {
+			this.$chooseDriveFile({
+				multiple: false
+			}).then(file => {
+				this.file = file;
+				this.value.fileId = file.id;
+			});
+		},
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.oyyftmcf
+	> .preview
+		height 150px
+
+</style>

src/client/app/common/views/components/page-editor/page-editor.input.vue

@@ -0,0 +1,54 @@
+<template>
+<x-container @remove="() => $emit('remove')">
+	<template #header><fa :icon="faBolt"/> {{ $t('blocks.input') }}</template>
+
+	<section class="dnvasjon">
+		<ui-input v-model="value.name"><template #prefix><fa :icon="faSquareRootAlt"/></template><span>{{ $t('blocks._input.name') }}</span></ui-input>
+		<ui-input v-model="value.text"><span>{{ $t('blocks._input.text') }}</span></ui-input>
+		<ui-select v-model="value.inputType">
+			<template #label>{{ $t('blocks._input.inputType') }}</template>
+			<option value="string">{{ $t('blocks._input._inputType.string') }}</option>
+			<option value="number">{{ $t('blocks._input._inputType.number') }}</option>
+		</ui-select>
+		<ui-input v-model="value.default" :type="value.inputType"><span>{{ $t('blocks._input.default') }}</span></ui-input>
+	</section>
+</x-container>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../../i18n';
+import { faBolt, faSquareRootAlt } from '@fortawesome/free-solid-svg-icons';
+import XContainer from './page-editor.container.vue';
+
+export default Vue.extend({
+	i18n: i18n('pages'),
+
+	components: {
+		XContainer
+	},
+
+	props: {
+		value: {
+			required: true
+		},
+	},
+
+	data() {
+		return {
+			faBolt, faSquareRootAlt
+		};
+	},
+
+	created() {
+		if (this.value.name == null) Vue.set(this.value, 'name', '');
+		if (this.value.inputType == null) Vue.set(this.value, 'inputType', 'string');
+	},
+});
+</script>
+
+<style lang="stylus" scoped>
+.dnvasjon
+	padding 0 16px 0 16px
+
+</style>

src/client/app/common/views/components/page-editor/page-editor.script-block.vue

@@ -0,0 +1,263 @@
+<template>
+<x-container :removable="removable" @remove="() => $emit('remove')" :error="error" :warn="warn">
+	<template #header><fa v-if="icon" :icon="icon"/> <template v-if="title">{{ title }} <span class="turmquns" v-if="typeText">({{ typeText }})</span></template><template v-else-if="typeText">{{ typeText }}</template></template>
+	<template #func>
+		<button @click="changeType()">
+			<fa :icon="faPencilAlt"/>
+		</button>
+	</template>
+
+	<section v-if="value.type === null" class="pbglfege" @click="changeType()">
+		{{ $t('script.emptySlot') }}
+	</section>
+	<section v-else-if="value.type === 'text'" class="tbwccoaw">
+		<input v-model="value.value"/>
+	</section>
+	<section v-else-if="value.type === 'multiLineText'" class="tbwccoaw">
+		<textarea v-model="value.value"></textarea>
+	</section>
+	<section v-else-if="value.type === 'textList'" class="frvuzvoi">
+		<ui-textarea v-model="value.value"></ui-textarea>
+	</section>
+	<section v-else-if="value.type === 'number'" class="tbwccoaw">
+		<input v-model="value.value" type="number"/>
+	</section>
+	<section v-else-if="value.type === 'ref'" class="hpdwcrvs">
+		<select v-model="value.value">
+			<option v-for="v in aiScript.getVarsByType(getExpectedType ? getExpectedType() : null).filter(x => x.name !== name)" :value="v.name">{{ v.name }}</option>
+			<optgroup :label="$t('script.pageVariables')">
+				<option v-for="v in aiScript.getPageVarsByType(getExpectedType ? getExpectedType() : null)" :value="v">{{ v }}</option>
+			</optgroup>
+			<optgroup :label="$t('script.enviromentVariables')">
+				<option v-for="v in aiScript.getEnvVarsByType(getExpectedType ? getExpectedType() : null)" :value="v">{{ v }}</option>
+			</optgroup>
+		</select>
+	</section>
+	<section v-else-if="value.type === 'in'" class="hpdwcrvs">
+		<select v-model="value.value">
+			<option v-for="v in fnSlots" :value="v">{{ v }}</option>
+		</select>
+	</section>
+	<section v-else-if="value.type === 'fn'" class="" style="padding:16px;">
+		<ui-textarea v-model="slots"></ui-textarea>
+		<x-v v-if="value.value.expression" v-model="value.value.expression" :title="$t(`script.blocks._fn.arg1`)" :get-expected-type="() => null" :ai-script="aiScript" :fn-slots="value.value.slots" :name="name"/>
+	</section>
+	<section v-else-if="value.type.startsWith('fn:')" class="" style="padding:16px;">
+		<x-v v-for="(x, i) in value.args" v-model="value.args[i]" :title="aiScript.getVarByName(value.type.split(':')[1]).value.slots[i]" :get-expected-type="() => null" :ai-script="aiScript" :name="name" :key="i"/>
+	</section>
+	<section v-else class="" style="padding:16px;">
+		<x-v v-for="(x, i) in value.args" v-model="value.args[i]" :title="$t(`script.blocks._${value.type}.arg${i + 1}`)" :get-expected-type="() => _getExpectedType(i)" :ai-script="aiScript" :name="name" :fn-slots="fnSlots" :key="i"/>
+	</section>
+</x-container>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../../i18n';
+import XContainer from './page-editor.container.vue';
+import { faSuperscript, faPencilAlt, faSquareRootAlt } from '@fortawesome/free-solid-svg-icons';
+import { AiScript } from '../../../scripts/aiscript';
+import * as uuid from 'uuid';
+
+export default Vue.extend({
+	i18n: i18n('pages'),
+
+	components: {
+		XContainer
+	},
+
+	inject: ['getScriptBlockList'],
+
+	props: {
+		getExpectedType: {
+			required: false,
+			default: null
+		},
+		value: {
+			required: true
+		},
+		title: {
+			required: false
+		},
+		removable: {
+			required: false,
+			default: false
+		},
+		aiScript: {
+			required: true,
+		},
+		name: {
+			required: true,
+		},
+		fnSlots: {
+			required: false,
+		},
+	},
+
+	data() {
+		return {
+			AiScript,
+			error: null,
+			warn: null,
+			slots: '',
+			faSuperscript, faPencilAlt, faSquareRootAlt
+		};
+	},
+
+	computed: {
+		icon(): any {
+			if (this.value.type === null) return null;
+			if (this.value.type.startsWith('fn:')) return null;
+			return AiScript.blockDefs.find(x => x.type === this.value.type).icon;
+		},
+		typeText(): any {
+			if (this.value.type === null) return null;
+			return this.$t(`script.blocks.${this.value.type}`);
+		},
+	},
+
+	watch: {
+		slots() {
+			this.value.value.slots = this.slots.split('\n');
+		}
+	},
+
+	beforeCreate() {
+		this.$options.components.XV = require('./page-editor.script-block.vue').default;
+	},
+
+	created() {
+		if (this.value.value == null) Vue.set(this.value, 'value', null);
+
+		if (this.value.value && this.value.value.slots) this.slots = this.value.value.slots.join('\n');
+
+		this.$watch('value.type', (t) => {
+			this.warn = null;
+
+			if (this.value.type === 'fn') {
+				const id = uuid.v4();
+				this.value.value = {};
+				Vue.set(this.value.value, 'slots', []);
+				Vue.set(this.value.value, 'expression', { id, type: null });
+				return;
+			}
+
+			if (this.value.type && this.value.type.startsWith('fn:')) {
+				const fnName = this.value.type.split(':')[1];
+				const fn = this.aiScript.getVarByName(fnName);
+
+				const empties = [];
+				for (let i = 0; i < fn.value.slots.length; i++) {
+					const id = uuid.v4();
+					empties.push({ id, type: null });
+				}
+				Vue.set(this.value, 'args', empties);
+				return;
+			}
+
+			if (AiScript.isLiteralBlock(this.value)) return;
+
+			const empties = [];
+			for (let i = 0; i < AiScript.funcDefs[this.value.type].in.length; i++) {
+				const id = uuid.v4();
+				empties.push({ id, type: null });
+			}
+			Vue.set(this.value, 'args', empties);
+
+			for (let i = 0; i < AiScript.funcDefs[this.value.type].in.length; i++) {
+				const inType = AiScript.funcDefs[this.value.type].in[i];
+				if (typeof inType !== 'number') {
+					if (inType === 'number') this.value.args[i].type = 'number';
+					if (inType === 'string') this.value.args[i].type = 'text';
+				}
+			}
+		});
+
+		this.$watch('value.args', (args) => {
+			if (args == null) {
+				this.warn = null;
+				return;
+			}
+			const emptySlotIndex = args.findIndex(x => x.type === null);
+			if (emptySlotIndex !== -1 && emptySlotIndex < args.length) {
+				this.warn = {
+					slot: emptySlotIndex
+				};
+			} else {
+				this.warn = null;
+			}
+		}, {
+			deep: true
+		});
+
+		this.$watch('aiScript.variables', () => {
+			if (this.type != null && this.value) {
+				this.error = this.aiScript.typeCheck(this.value);
+			}
+		}, {
+			deep: true
+		});
+	},
+
+	methods: {
+		async changeType() {
+			const { canceled, result: type } = await this.$root.dialog({
+				type: null,
+				title: this.$t('select-type'),
+				select: {
+					groupedItems: this.getScriptBlockList(this.getExpectedType ? this.getExpectedType() : null)
+				},
+				showCancelButton: true
+			});
+			if (canceled) return;
+			this.value.type = type;
+		},
+
+		_getExpectedType(slot: number) {
+			return this.aiScript.getExpectedType(this.value, slot);
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.turmquns
+	opacity 0.7
+
+.pbglfege
+	opacity 0.5
+	padding 16px
+	text-align center
+	cursor pointer
+	color var(--text)
+
+.tbwccoaw
+	> input
+	> textarea
+		display block
+		-webkit-appearance none
+		-moz-appearance none
+		appearance none
+		width 100%
+		max-width 100%
+		min-width 100%
+		border none
+		box-shadow none
+		padding 16px
+		font-size 16px
+		background transparent
+		color var(--text)
+
+	> textarea
+		min-height 100px
+
+.hpdwcrvs
+	padding 16px
+
+	> select
+		display block
+		padding 4px
+		font-size 16px
+		width 100%
+
+</style>

src/client/app/common/views/components/page-editor/page-editor.section.vue

@@ -0,0 +1,133 @@
+<template>
+<x-container @remove="() => $emit('remove')">
+	<template #header><fa :icon="faStickyNote"/> {{ value.title }}</template>
+	<template #func>
+		<button @click="rename()">
+			<fa :icon="faPencilAlt"/>
+		</button>
+		<button @click="add()">
+			<fa :icon="faPlus"/>
+		</button>
+	</template>
+
+	<section class="ilrvjyvi">
+		<div class="children">
+			<x-block v-for="child in value.children" :value="child" @input="v => updateItem(v)" @remove="() => remove(child)" :key="child.id"/>
+		</div>
+	</section>
+</x-container>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../../i18n';
+import { faPlus, faPencilAlt } from '@fortawesome/free-solid-svg-icons';
+import { faStickyNote } from '@fortawesome/free-regular-svg-icons';
+import XContainer from './page-editor.container.vue';
+import * as uuid from 'uuid';
+
+export default Vue.extend({
+	i18n: i18n('pages'),
+
+	components: {
+		XContainer
+	},
+
+	props: {
+		value: {
+			required: true
+		},
+	},
+
+	data() {
+		return {
+			faStickyNote, faPlus, faPencilAlt
+		};
+	},
+
+	beforeCreate() {
+		this.$options.components.XBlock = require('./page-editor.block.vue').default
+	},
+
+	created() {
+		if (this.value.title == null) Vue.set(this.value, 'title', null);
+		if (this.value.children == null) Vue.set(this.value, 'children', []);
+	},
+
+	mounted() {
+		if (this.value.title == null) {
+			this.rename();
+		}
+	},
+
+	methods: {
+		async rename() {
+			const { canceled, result: title } = await this.$root.dialog({
+				title: 'Enter title',
+				input: {
+					type: 'text',
+					default: this.value.title
+				},
+				showCancelButton: true
+			});
+			if (canceled) return;
+			this.value.title = title;
+		},
+
+		async add() {
+			const { canceled, result: type } = await this.$root.dialog({
+				type: null,
+				title: this.$t('choose-block'),
+				select: {
+					items: [{
+						value: 'section', text: this.$t('blocks.section')
+					}, {
+						value: 'text', text: this.$t('blocks.text')
+					}, {
+						value: 'image', text: this.$t('blocks.image')
+					}, {
+						value: 'button', text: this.$t('blocks.button')
+					}, {
+						value: 'input', text: this.$t('blocks.input')
+					}, {
+						value: 'switch', text: this.$t('blocks.switch')
+					}]
+				},
+				showCancelButton: true
+			});
+			if (canceled) return;
+
+			const id = uuid.v4();
+			this.value.children.push({ id, type });
+		},
+
+		updateItem(v) {
+			const i = this.value.children.findIndex(x => x.id === v.id);
+			const newValue = [
+				...this.value.children.slice(0, i),
+				v,
+				...this.value.children.slice(i + 1)
+			];
+			this.value.children = newValue;
+			this.$emit('input', this.value);
+		},
+
+		remove(el) {
+			const i = this.value.children.findIndex(x => x.id === el.id);
+			const newValue = [
+				...this.value.children.slice(0, i),
+				...this.value.children.slice(i + 1)
+			];
+			this.value.children = newValue;
+			this.$emit('input', this.value);
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.ilrvjyvi
+	> .children
+		padding 16px
+
+</style>

src/client/app/common/views/components/page-editor/page-editor.switch.vue

@@ -0,0 +1,48 @@
+<template>
+<x-container @remove="() => $emit('remove')">
+	<template #header><fa :icon="faBolt"/> {{ $t('blocks.switch') }}</template>
+
+	<section class="kjuadyyj">
+		<ui-input v-model="value.name"><template #prefix><fa :icon="faSquareRootAlt"/></template><span>{{ $t('blocks._switch.name') }}</span></ui-input>
+		<ui-input v-model="value.text"><span>{{ $t('blocks._switch.text') }}</span></ui-input>
+		<ui-switch v-model="value.default"><span>{{ $t('blocks._switch.default') }}</span></ui-switch>
+	</section>
+</x-container>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../../i18n';
+import { faBolt, faSquareRootAlt } from '@fortawesome/free-solid-svg-icons';
+import XContainer from './page-editor.container.vue';
+
+export default Vue.extend({
+	i18n: i18n('pages'),
+
+	components: {
+		XContainer
+	},
+
+	props: {
+		value: {
+			required: true
+		},
+	},
+
+	data() {
+		return {
+			faBolt, faSquareRootAlt
+		};
+	},
+
+	created() {
+		if (this.value.name == null) Vue.set(this.value, 'name', '');
+	},
+});
+</script>
+
+<style lang="stylus" scoped>
+.kjuadyyj
+	padding 0 16px 16px 16px
+
+</style>

src/client/app/common/views/components/page-editor/page-editor.text.vue

@@ -0,0 +1,57 @@
+<template>
+<x-container @remove="() => $emit('remove')">
+	<template #header><fa :icon="faAlignLeft"/> {{ $t('blocks.text') }}</template>
+
+	<section class="ihymsbbe">
+		<textarea v-model="value.text"></textarea>
+	</section>
+</x-container>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../../i18n';
+import { faAlignLeft } from '@fortawesome/free-solid-svg-icons';
+import XContainer from './page-editor.container.vue';
+
+export default Vue.extend({
+	i18n: i18n('pages'),
+
+	components: {
+		XContainer
+	},
+
+	props: {
+		value: {
+			required: true
+		},
+	},
+
+	data() {
+		return {
+			faAlignLeft,
+		};
+	},
+
+	created() {
+		if (this.value.text == null) Vue.set(this.value, 'text', '');
+	},
+});
+</script>
+
+<style lang="stylus" scoped>
+.ihymsbbe
+	> textarea
+		display block
+		-webkit-appearance none
+		-moz-appearance none
+		appearance none
+		width 100%
+		min-width 100%
+		min-height 150px
+		border none
+		box-shadow none
+		padding 16px
+		background transparent
+		color var(--text)
+</style>

src/client/app/common/views/components/page-editor/page-editor.vue

@@ -0,0 +1,452 @@
+<template>
+<div>
+	<div class="gwbmwxkm" :class="{ shadow: $store.state.device.useShadow, round: $store.state.device.roundedCorners }">
+		<header>
+			<div class="title"><fa :icon="faStickyNote"/> {{ pageId ? $t('edit-page') : $t('new-page') }}</div>
+			<div class="buttons">
+				<button @click="del()"><fa :icon="faTrashAlt"/></button>
+				<button @click="() => showOptions = !showOptions"><fa :icon="faCog"/></button>
+				<button @click="save()"><fa :icon="faSave"/></button>
+			</div>
+		</header>
+
+		<section>
+			<ui-input v-model="title">
+				<span>{{ $t('title') }}</span>
+			</ui-input>
+
+			<template v-if="showOptions">
+				<ui-input v-model="summary">
+					<span>{{ $t('summary') }}</span>
+				</ui-input>
+
+				<ui-input v-model="name">
+					<template #prefix>{{ url }}/@{{ $store.state.i.username }}/pages/</template>
+					<span>{{ $t('url') }}</span>
+				</ui-input>
+
+				<ui-switch v-model="alignCenter">{{ $t('align-center') }}</ui-switch>
+
+				<ui-select v-model="font">
+					<template #label>{{ $t('font') }}</template>
+					<option value="serif">{{ $t('fontSerif') }}</option>
+					<option value="sans-serif">{{ $t('fontSansSerif') }}</option>
+				</ui-select>
+
+				<div class="eyeCatch">
+					<ui-button v-if="eyeCatchingImageId == null" @click="setEyeCatchingImage()"><fa :icon="faPlus"/> {{ $t('set-eye-catchig-image') }}</ui-button>
+					<div v-else-if="eyeCatchingImage">
+						<img :src="eyeCatchingImage.url" :alt="eyeCatchingImage.name"/>
+						<ui-button @click="removeEyeCatchingImage()"><fa :icon="faTrashAlt"/> {{ $t('remove-eye-catchig-image') }}</ui-button>
+					</div>
+				</div>
+			</template>
+
+			<div class="content" v-for="child in content">
+				<x-block :value="child" @input="v => updateItem(v)" @remove="() => remove(child)" :key="child.id"/>
+			</div>
+
+			<ui-button @click="add()"><fa :icon="faPlus"/></ui-button>
+		</section>
+	</div>
+
+	<ui-container :body-togglable="true">
+		<template #header><fa :icon="faSquareRootAlt"/> {{ $t('variables') }}</template>
+		<div class="qmuvgica">
+			<div class="variables" v-show="variables.length > 0">
+				<template v-for="variable in variables">
+					<x-variable
+						:value="variable"
+						:removable="true"
+						@input="v => updateVariable(v)"
+						@remove="() => removeVariable(variable)"
+						:key="variable.name"
+						:ai-script="aiScript"
+						:name="variable.name"
+						:title="variable.name"
+					/>
+				</template>
+			</div>
+
+			<ui-button @click="addVariable()" class="add"><fa :icon="faPlus"/></ui-button>
+
+			<ui-info><span v-html="$t('variables-info')"></span><a @click="() => moreDetails = true" style="display:block;">{{ $t('more-details') }}</a></ui-info>
+
+			<template v-if="moreDetails">
+				<ui-info><span v-html="$t('variables-info2')"></span></ui-info>
+				<ui-info><span v-html="$t('variables-info3')"></span></ui-info>
+			</template>
+		</div>
+	</ui-container>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../../i18n';
+import { faICursor, faPlus, faSquareRootAlt, faCog } from '@fortawesome/free-solid-svg-icons';
+import { faSave, faStickyNote, faTrashAlt } from '@fortawesome/free-regular-svg-icons';
+import XVariable from './page-editor.script-block.vue';
+import XBlock from './page-editor.block.vue';
+import * as uuid from 'uuid';
+import { AiScript } from '../../../scripts/aiscript';
+import { url } from '../../../../config';
+import { collectPageVars } from '../../../scripts/collect-page-vars';
+
+export default Vue.extend({
+	i18n: i18n('pages'),
+
+	components: {
+		XVariable, XBlock
+	},
+
+	props: {
+		page: {
+			type: String,
+			required: false
+		}
+	},
+
+	data() {
+		return {
+			pageId: null,
+			title: '',
+			summary: null,
+			name: Date.now().toString(),
+			eyeCatchingImage: null,
+			eyeCatchingImageId: null,
+			font: 'sans-serif',
+			content: [],
+			alignCenter: false,
+			variables: [],
+			aiScript: null,
+			showOptions: false,
+			moreDetails: false,
+			url,
+			faPlus, faICursor, faSave, faStickyNote, faSquareRootAlt, faCog, faTrashAlt
+		};
+	},
+
+	watch: {
+		async eyeCatchingImageId() {
+			if (this.eyeCatchingImageId == null) {
+				this.eyeCatchingImage = null;
+			} else {
+				this.eyeCatchingImage = await this.$root.api('drive/files/show', {
+					fileId: this.eyeCatchingImageId,
+				});
+			}
+		},
+	},
+
+	created() {
+		this.aiScript = new AiScript();
+
+		this.$watch('variables', () => {
+			this.aiScript.injectVars(this.variables);
+		}, { deep: true });
+
+		this.$watch('content', () => {
+			this.aiScript.injectPageVars(collectPageVars(this.content));
+		}, { deep: true });
+
+		if (this.page) {
+			this.$root.api('pages/show', {
+				pageId: this.page,
+			}).then(page => {
+				this.pageId = page.id;
+				this.title = page.title;
+				this.name = page.name;
+				this.summary = page.summary;
+				this.font = page.font;
+				this.alignCenter = page.alignCenter;
+				this.content = page.content;
+				this.variables = page.variables;
+				this.eyeCatchingImageId = page.eyeCatchingImageId;
+			});
+		} else {
+			const id = uuid.v4();
+			this.content = [{
+				id,
+				type: 'text',
+				text: 'Hello World!'
+			}];
+		}
+	},
+
+	provide() {
+		return {
+			getScriptBlockList: this.getScriptBlockList
+		}
+	},
+
+	methods: {
+		save() {
+			if (this.pageId) {
+				this.$root.api('pages/update', {
+					pageId: this.pageId,
+					title: this.title.trim(),
+					name: this.name.trim(),
+					summary: this.summary,
+					font: this.font,
+					alignCenter: this.alignCenter,
+					content: this.content,
+					variables: this.variables,
+					eyeCatchingImageId: this.eyeCatchingImageId,
+				}).then(page => {
+					this.$root.dialog({
+						type: 'success',
+						text: this.$t('page-updated')
+					});
+				});
+			} else {
+				this.$root.api('pages/create', {
+					title: this.title.trim(),
+					name: this.name.trim(),
+					summary: this.summary,
+					font: this.font,
+					alignCenter: this.alignCenter,
+					content: this.content,
+					variables: this.variables,
+					eyeCatchingImageId: this.eyeCatchingImageId,
+				}).then(page => {
+					this.pageId = page.id;
+					this.$root.dialog({
+						type: 'success',
+						text: this.$t('page-created')
+					});
+					this.$router.push(`/i/pages/edit/${this.pageId}`);
+				});
+			}
+		},
+
+		del() {
+			this.$root.dialog({
+				type: 'warning',
+				text: this.$t('are-you-sure-delete'),
+				showCancelButton: true
+			}).then(({ canceled }) => {
+				if (canceled) return;
+				this.$root.api('pages/delete', {
+					pageId: this.pageId,
+				}).then(() => {
+					this.$root.dialog({
+						type: 'success',
+						text: this.$t('page-deleted')
+					});
+					this.$router.push(`/i/pages`);
+				});
+			});
+		},
+
+		async add() {
+			const { canceled, result: type } = await this.$root.dialog({
+				type: null,
+				title: this.$t('choose-block'),
+				select: {
+					items: [{
+						value: 'section', text: this.$t('blocks.section')
+					}, {
+						value: 'text', text: this.$t('blocks.text')
+					}, {
+						value: 'image', text: this.$t('blocks.image')
+					}, {
+						value: 'button', text: this.$t('blocks.button')
+					}, {
+						value: 'input', text: this.$t('blocks.input')
+					}, {
+						value: 'switch', text: this.$t('blocks.switch')
+					}]
+				},
+				showCancelButton: true
+			});
+			if (canceled) return;
+
+			const id = uuid.v4();
+			this.content.push({ id, type });
+		},
+
+		async addVariable() {
+			let { canceled, result: name } = await this.$root.dialog({
+				title: this.$t('enter-variable-name'),
+				input: {
+					type: 'text',
+				},
+				showCancelButton: true
+			});
+			if (canceled) return;
+
+			name = name.trim();
+
+			if (this.aiScript.isUsedName(name)) {
+				this.$root.dialog({
+					type: 'error',
+					text: this.$t('the-variable-name-is-already-used')
+				});
+				return;
+			}
+
+			const id = uuid.v4();
+			this.variables.push({ id, name, type: null });
+		},
+
+		updateItem(v) {
+			const i = this.content.findIndex(x => x.id === v.id);
+			const newValue = [
+				...this.content.slice(0, i),
+				v,
+				...this.content.slice(i + 1)
+			];
+			this.content = newValue;
+		},
+
+		remove(el) {
+			const i = this.content.findIndex(x => x.id === el.id);
+			const newValue = [
+				...this.content.slice(0, i),
+				...this.content.slice(i + 1)
+			];
+			this.content = newValue;
+		},
+
+		removeVariable(v) {
+			const i = this.variables.findIndex(x => x.name === v.name);
+			const newValue = [
+				...this.variables.slice(0, i),
+				...this.variables.slice(i + 1)
+			];
+			this.variables = newValue;
+		},
+
+		getScriptBlockList(type: string = null) {
+			const list = [];
+
+			const blocks = AiScript.blockDefs.filter(block => type === null || block.out === null || block.out === type);
+
+			for (const block of blocks) {
+				const category = list.find(x => x.category === block.category);
+				if (category) {
+					category.items.push({
+						value: block.type,
+						text: this.$t(`script.blocks.${block.type}`)
+					});
+				} else {
+					list.push({
+						category: block.category,
+						label: this.$t(`script.categories.${block.category}`),
+						items: [{
+							value: block.type,
+							text: this.$t(`script.blocks.${block.type}`)
+						}]
+					});
+				}
+			}
+
+			const userFns = this.variables.filter(x => x.type === 'fn');
+			if (userFns.length > 0) {
+				list.unshift({
+					label: this.$t(`script.categories.fn`),
+					items: userFns.map(v => ({
+						value: 'fn:' + v.name,
+						text: v.name
+					}))
+				});
+			}
+
+			return list;
+		},
+
+		setEyeCatchingImage() {
+			this.$chooseDriveFile({
+				multiple: false
+			}).then(file => {
+				this.eyeCatchingImageId = file.id;
+			});
+		},
+
+		removeEyeCatchingImage() {
+			this.eyeCatchingImageId = null;
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.gwbmwxkm
+	overflow hidden
+	background var(--face)
+	margin-bottom 16px
+
+	&.round
+		border-radius 6px
+
+	&.shadow
+		box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)
+
+	> header
+		background var(--faceHeader)
+
+		> .title
+			z-index 1
+			margin 0
+			padding 0 16px
+			line-height 42px
+			font-size 0.9em
+			font-weight bold
+			color var(--faceHeaderText)
+			box-shadow 0 var(--lineWidth) rgba(#000, 0.07)
+
+			> [data-icon]
+				margin-right 6px
+
+			&:empty
+				display none
+
+		> .buttons
+			position absolute
+			z-index 2
+			top 0
+			right 0
+
+			> button
+				padding 0
+				width 42px
+				font-size 0.9em
+				line-height 42px
+				color var(--faceTextButton)
+
+				&:hover
+					color var(--faceTextButtonHover)
+
+				&:active
+					color var(--faceTextButtonActive)
+
+	> section
+		padding 0 32px 32px 32px
+
+		@media (max-width 500px)
+			padding 0 16px 16px 16px
+
+		> .content
+			margin-bottom 16px
+
+		> .eyeCatch
+			margin-bottom 16px
+
+			> div
+				> img
+					max-width 100%
+
+.qmuvgica
+	padding 32px
+
+	@media (max-width 500px)
+		padding 16px
+
+	> .variables
+		margin-bottom 16px
+
+	> .add
+		margin-bottom 16px
+
+</style>

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

@@ -0,0 +1,141 @@
+<template>
+<router-link :to="`/@${page.user.username}/pages/${page.name}`" class="vhpxefrj" tabindex="-1" :class="{ shadow: $store.state.device.useShadow, round: $store.state.device.roundedCorners }">
+	<div class="thumbnail" v-if="page.eyeCatchingImage" :style="`background-image: url('${page.eyeCatchingImage.thumbnailUrl}')`"></div>
+	<article>
+		<header>
+			<h1 :title="page.title">{{ page.title }}</h1>
+		</header>
+		<p v-if="page.summary" :title="page.summary">{{ page.summary.length > 85 ? page.summary.slice(0, 85) + '…' : page.summary }}</p>
+		<footer>
+			<img class="icon" :src="page.user.avatarUrl"/>
+			<p>{{ page.user | userName }}</p>
+		</footer>
+	</article>
+</router-link>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		page: {
+			type: Object,
+			required: true
+		},
+	},
+});
+</script>
+
+<style lang="stylus" scoped>
+.vhpxefrj
+	display block
+	overflow hidden
+	width 100%
+	background var(--face)
+
+	&.round
+		border-radius 8px
+
+	&.shadow
+		box-shadow 0 4px 16px rgba(#000, 0.1)
+
+		@media (min-width 500px)
+			box-shadow 0 8px 32px rgba(#000, 0.1)
+
+	> .thumbnail
+		position absolute
+		width 100px
+		height 100%
+		background-position center
+		background-size cover
+		display flex
+		justify-content center
+		align-items center
+
+		> button
+			font-size 3.5em
+			opacity: 0.7
+
+			&:hover
+				font-size 4em
+				opacity 0.9
+
+		& + article
+			left 100px
+			width calc(100% - 100px)
+
+	> article
+		padding 16px
+
+		> header
+			margin-bottom 8px
+
+			> h1
+				margin 0
+				font-size 1em
+				color var(--urlPreviewTitle)
+
+		> p
+			margin 0
+			color var(--urlPreviewText)
+			font-size 0.8em
+
+		> footer
+			margin-top 8px
+			height 16px
+
+			> img
+				display inline-block
+				width 16px
+				height 16px
+				margin-right 4px
+				vertical-align top
+
+			> p
+				display inline-block
+				margin 0
+				color var(--urlPreviewInfo)
+				font-size 0.8em
+				line-height 16px
+				vertical-align top
+
+	@media (max-width 700px)
+		> .thumbnail
+			position relative
+			width 100%
+			height 100px
+
+			& + article
+				left 0
+				width 100%
+
+	@media (max-width 550px)
+		font-size 12px
+
+		> .thumbnail
+			height 80px
+
+		> article
+			padding 12px
+
+	@media (max-width 500px)
+		font-size 10px
+
+		> .thumbnail
+			height 70px
+
+		> article
+			padding 8px
+
+			> header
+				margin-bottom 4px
+
+			> footer
+				margin-top 4px
+
+				> img
+					width 12px
+					height 12px
+
+</style>

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" @change="onEndpointChange()">
 			<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({
@@ -72,6 +80,22 @@ export default Vue.extend({
 				this.sending = false;
 				this.res = JSON5.stringify(err, null, 2);
 			});
+		},
+
+		onEndpointChange() {
+			this.$root.api('endpoint', { endpoint: this.endpoint }).then(endpoint => {
+				const body = {};
+				for (const p of endpoint.params) {
+					body[p.name] =
+						p.type === 'String' ? '' :
+						p.type === 'Number' ? 0 :
+						p.type === 'Boolean' ? false :
+						p.type === 'Array' ? [] :
+						p.type === 'Object' ? {} :
+						null;
+				}
+				this.body = JSON5.stringify(body, null, 2);
+			});
 		}
 	}
 });

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', {
-					wallpaperId: file.id
-				});
+				this.$store.dispatch('settings/set', { key: 'wallpaper', value: file.url });
 			});
 		},
 		deleteWallpaper() {
-			this.$root.api('i/update', {
-				wallpaperId: null
-			});
+			this.$store.dispatch('settings/set', { key: 'wallpaper', value: 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'),
-						text: this.$t('no-updates-desc')
+						title: this.$t('@._settings.no-updates'),
+						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,8 @@
 				@focus="focused = true"
 				@blur="focused = false"
 				@keydown="$emit('keydown', $event)"
+				@change="$emit('change', $event)"
+				:list="id"
 			>
 			<input v-else ref="input"
 				:type="type"
@@ -37,7 +39,12 @@
 				@focus="focused = true"
 				@blur="focused = false"
 				@keydown="$emit('keydown', $event)"
+				@change="$emit('change', $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"
@@ -55,7 +62,7 @@
 		<div class="suffix" ref="suffix"><slot name="suffix"></slot></div>
 	</div>
 	<div class="toggle" v-if="withPasswordToggle">
-		<a @click='togglePassword'>
+		<a @click="togglePassword">
 			<span v-if="type == 'password'"><fa :icon="['fa', 'eye']"/> {{ $t('@.show-password') }}</span>
 			<span v-if="type != 'password'"><fa :icon="['far', 'eye-slash']"/> {{ $t('@.hide-password') }}</span>
 		</a>
@@ -130,6 +137,10 @@ export default Vue.extend({
 			required: false,
 			default: false
 		},
+		datalist: {
+			type: Array,
+			required: false,
+		},
 		inline: {
 			type: Boolean,
 			required: false,
@@ -147,7 +158,8 @@ export default Vue.extend({
 		return {
 			v: this.value,
 			focused: false,
-			passwordStrength: ''
+			passwordStrength: '',
+			id: Math.random().toString()
 		};
 	},
 	computed: {

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

@@ -38,10 +38,10 @@ export default Vue.extend({
 				const data = new FormData();
 				data.append('md5', getMD5(fileData));
 
-				this.$root.api('drive/files/check_existence', {
+				this.$root.api('drive/files/find-by-hash', {
 					md5: getMD5(fileData)
 				}).then(resp => {
-					resolve(resp.file);
+					resolve(resp.length > 0 ? resp[0] : null);
 				});
 			});
 		},

src/client/app/common/views/components/user-list-editor.vue

@@ -77,11 +77,11 @@ export default Vue.extend({
 				input: {
 					default: this.list.name
 				}
-			}).then(({ canceled, result: title }) => {
+			}).then(({ canceled, result: name }) => {
 				if (canceled) return;
 				this.$root.api('users/lists/update', {
 					listId: this.list.id,
-					title: title
+					name: name
 				});
 			});
 		},

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

@@ -60,9 +60,9 @@ export default Vue.extend({
 	},
 
 	methods: {
-		init() {
+		async init() {
 			this.fetching = true;
-			this.makePromise().then(x => {
+			await (this.makePromise()).then(x => {
 				if (Array.isArray(x)) {
 					this.us = x;
 				} else {
@@ -76,9 +76,9 @@ export default Vue.extend({
 			});
 		},
 
-		fetchMoreUsers() {
+		async fetchMoreUsers() {
 			this.fetchingMoreUsers = true;
-			this.makePromise(this.cursor).then(x => {
+			await (this.makePromise(this.cursor)).then(x => {
 				this.us = this.us.concat(x.users);
 				this.cursor = x.cursor;
 				this.fetchingMoreUsers = false;

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: name }) => {
+				if (canceled) return;
+				const list = await this.$root.api('users/lists/create', {
+					name
+				});
+
+				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.notes.vue

@@ -110,11 +110,11 @@ export default Vue.extend({
 			this.init();
 		},
 
-		init() {
+		async init() {
 			this.queue = [];
 			this.notes = [];
 			this.fetching = true;
-			this.makePromise().then(x => {
+			await (this.makePromise()).then(x => {
 				if (Array.isArray(x)) {
 					this.notes = x;
 				} else {
@@ -129,10 +129,10 @@ export default Vue.extend({
 			});
 		},
 
-		fetchMore() {
+		async fetchMore() {
 			if (!this.more || this.moreFetching) return;
 			this.moreFetching = true;
-			this.makePromise(this.notes[this.notes.length - 1].id).then(x => {
+			await (this.makePromise(this.notes[this.notes.length - 1].id)).then(x => {
 				this.notes = this.notes.concat(x.notes);
 				this.more = x.more;
 				this.moreFetching = false;

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

@@ -14,6 +14,7 @@
 import Vue from 'vue';
 import XColumn from './deck.column.vue';
 import XNotes from './deck.notes.vue';
+import { genSearchQuery } from '../../../common/scripts/gen-search-query';
 
 const limit = 20;
 
@@ -25,10 +26,10 @@ export default Vue.extend({
 
 	data() {
 		return {
-			makePromise: cursor => this.$root.api('notes/search', {
+			makePromise: async cursor => this.$root.api('notes/search', {
 				limit: limit + 1,
 				offset: cursor ? cursor : undefined,
-				query: this.q
+				...(await genSearchQuery(this, this.q))
 			}).then(notes => {
 				if (notes.length == limit + 1) {
 					notes.pop();

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/pages/page/page.block.vue

@@ -0,0 +1,34 @@
+<template>
+<component :is="'x-' + value.type" :value="value" :page="page" :script="script" :key="value.id" :h="h"/>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import XText from './page.text.vue';
+import XSection from './page.section.vue';
+import XImage from './page.image.vue';
+import XButton from './page.button.vue';
+import XInput from './page.input.vue';
+import XSwitch from './page.switch.vue';
+
+export default Vue.extend({
+	components: {
+		XText, XSection, XImage, XButton, XInput, XSwitch
+	},
+
+	props: {
+		value: {
+			required: true
+		},
+		script: {
+			required: true
+		},
+		page: {
+			required: true
+		},
+		h: {
+			required: true
+		}
+	},
+});
+</script>

src/client/app/common/views/pages/page/page.button.vue

@@ -0,0 +1,42 @@
+<template>
+<div>
+	<ui-button class="kudkigyw" @click="click()">{{ value.text }}</ui-button>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		value: {
+			required: true
+		},
+		script: {
+			required: true
+		}
+	},
+
+	methods: {
+		click() {
+			if (this.value.action === 'dialog') {
+				this.script.reEval();
+				this.$root.dialog({
+					text: this.script.interpolate(this.value.content)
+				});
+			} else if (this.value.action === 'resetRandom') {
+				this.script.aiScript.updateRandomSeed(Math.random());
+				this.script.reEval();
+			}
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.kudkigyw
+	display inline-block
+	min-width 300px
+	max-width 450px
+	margin 8px 0
+</style>

src/client/app/common/views/pages/page/page.image.vue

@@ -0,0 +1,36 @@
+<template>
+<div class="lzyxtsnt">
+	<img v-if="image" :src="image.url"/>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		value: {
+			required: true
+		},
+		page: {
+			required: true
+		},
+	},
+
+	data() {
+		return {
+			image: null,
+		};
+	},
+
+	created() {
+		this.image = this.page.attachedFiles.find(x => x.id === this.value.fileId);
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.lzyxtsnt
+	> img
+		max-width 100%
+</style>

src/client/app/common/views/pages/page/page.input.vue

@@ -0,0 +1,43 @@
+<template>
+<div>
+	<ui-input class="kudkigyw" v-model="v" :type="value.inputType">{{ value.text }}</ui-input>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		value: {
+			required: true
+		},
+		script: {
+			required: true
+		}
+	},
+
+	data() {
+		return {
+			v: this.value.default,
+		};
+	},
+
+	watch: {
+		v() {
+			let v = this.v;
+			if (this.value.inputType === 'number') v = parseInt(v, 10);
+			this.script.aiScript.updatePageVar(this.value.name, v);
+			this.script.reEval();
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.kudkigyw
+	display inline-block
+	min-width 300px
+	max-width 450px
+	margin 8px 0
+</style>

src/client/app/common/views/pages/page/page.section.vue

@@ -0,0 +1,55 @@
+<template>
+<section class="sdgxphyu">
+	<component :is="'h' + h">{{ value.title }}</component>
+
+	<div class="children">
+		<x-block v-for="child in value.children" :value="child" :page="page" :script="script" :key="child.id" :h="h + 1"/>
+	</div>
+</section>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		value: {
+			required: true
+		},
+		script: {
+			required: true
+		},
+		page: {
+			required: true
+		},
+		h: {
+			required: true
+		}
+	},
+
+	beforeCreate() {
+		this.$options.components.XBlock = require('./page.block.vue').default
+	},
+});
+</script>
+
+<style lang="stylus" scoped>
+.sdgxphyu
+	margin 1.5em 0
+
+	> h2
+		font-size 1.35em
+		margin 0 0 0.5em 0
+
+	> h3
+		font-size 1em
+		margin 0 0 0.5em 0
+
+	> h4
+		font-size 1em
+		margin 0 0 0.5em 0
+
+	> .children
+		//padding 16px
+
+</style>

src/client/app/common/views/pages/page/page.switch.vue

@@ -0,0 +1,33 @@
+<template>
+<div>
+	<ui-switch v-model="v">{{ value.text }}</ui-switch>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		value: {
+			required: true
+		},
+		script: {
+			required: true
+		}
+	},
+
+	data() {
+		return {
+			v: this.value.default,
+		};
+	},
+
+	watch: {
+		v() {
+			this.script.aiScript.updatePageVar(this.value.name, this.v);
+			this.script.reEval();
+		}
+	}
+});
+</script>

src/client/app/common/views/pages/page/page.text.vue

@@ -0,0 +1,35 @@
+<template>
+<div class="">
+	<mfm :text="text" :is-note="false" :i="$store.state.i" :key="text"/>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		value: {
+			required: true
+		},
+		script: {
+			required: true
+		}
+	},
+
+	data() {
+		return {
+			text: this.script.interpolate(this.value.text),
+		};
+	},
+
+	created() {
+		this.$watch('script.vars', () => {
+			this.text = this.script.interpolate(this.value.text);
+		}, { deep: true });
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+</style>

src/client/app/common/views/pages/page/page.vue

@@ -0,0 +1,143 @@
+<template>
+<div v-if="page" class="iroscrza" :class="{ shadow: $store.state.device.useShadow, round: $store.state.device.roundedCorners, center: page.alignCenter }" :style="{ fontFamily: page.font }">
+	<header>
+		<div class="title">{{ page.title }}</div>
+	</header>
+
+	<div v-if="script">
+		<x-block v-for="child in page.content" :value="child" @input="v => updateBlock(v)" :page="page" :script="script" :key="child.id" :h="2"/>
+	</div>
+
+	<footer>
+		<small>@{{ page.user.username }}</small>
+		<router-link v-if="$store.getters.isSignedIn && $store.state.i.id === page.userId" :to="`/i/pages/edit/${page.id}`">{{ $t('edit-this-page') }}</router-link>
+	</footer>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../../i18n';
+import { faICursor, faPlus, faSquareRootAlt } from '@fortawesome/free-solid-svg-icons';
+import { faSave, faStickyNote } from '@fortawesome/free-regular-svg-icons';
+import XBlock from './page.block.vue';
+import { AiScript } from '../../../scripts/aiscript';
+import { collectPageVars } from '../../../scripts/collect-page-vars';
+
+class Script {
+	public aiScript: AiScript;
+	public vars: any;
+
+	constructor(aiScript) {
+		this.aiScript = aiScript;
+		this.vars = this.aiScript.evaluateVars();
+	}
+
+	public reEval() {
+		this.vars = this.aiScript.evaluateVars();
+	}
+
+	public interpolate(str: string) {
+		return str.replace(/\{(.+?)\}/g, match =>
+			(this.vars.find(x => x.name === match.slice(1, -1).trim()).value || '').toString());
+	}
+}
+
+export default Vue.extend({
+	i18n: i18n('pages'),
+
+	components: {
+		XBlock
+	},
+
+	props: {
+		pageName: {
+			type: String,
+			required: true
+		},
+		username: {
+			type: String,
+			required: true
+		},
+	},
+
+	data() {
+		return {
+			page: null,
+			script: null,
+			faPlus, faICursor, faSave, faStickyNote, faSquareRootAlt
+		};
+	},
+
+	created() {
+		this.$root.api('pages/show', {
+			name: this.pageName,
+			username: this.username,
+		}).then(page => {
+			this.page = page;
+			const pageVars = this.getPageVars();
+			this.script = new Script(new AiScript(this.page.variables, pageVars, {
+				randomSeed: Math.random(),
+				user: page.user,
+				visitor: this.$store.state.i
+			}));
+		});
+	},
+
+	methods: {
+		getPageVars() {
+			return collectPageVars(this.page.content);
+		},
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.iroscrza
+	overflow hidden
+	background var(--face)
+
+	&.center
+		text-align center
+
+	&.round
+		border-radius 6px
+
+	&.shadow
+		box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)
+
+	> header
+		> .title
+			z-index 1
+			margin 0
+			padding 32px 64px
+			font-size 24px
+			font-weight bold
+			color var(--text)
+			box-shadow 0 var(--lineWidth) rgba(#000, 0.07)
+
+			@media (max-width 600px)
+				padding 16px 32px
+				font-size 20px
+
+	> div
+		color var(--text)
+		padding 48px 64px
+		font-size 18px
+
+		@media (max-width 600px)
+			padding 24px 32px
+			font-size 16px
+
+	> footer
+		color var(--text)
+		padding 0 64px 38px 64px
+
+		@media (max-width 600px)
+			padding 0 32px 28px 32px
+
+		> small
+			display block
+			opacity 0.5
+
+</style>

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

@@ -18,7 +18,8 @@
 			<p class="fetching" v-if="fetching">{{ $t('fetching') }}<mk-ellipsis/></p>
 			<h1 v-if="!fetching">{{ announcements.length == 0 ? $t('no-broadcasts') : announcements[i].title }}</h1>
 			<p v-if="!fetching">
-				<span v-if="announcements.length != 0" v-html="announcements[i].text"></span>
+				<mfm v-if="announcements.length != 0" :text="announcements[i].text" :key="i"/>
+				<img v-if="announcements.length != 0 && announcements[i].image" :src="announcements[i].image" alt="" style="display: block; max-height: 130px; max-width: 100%;"/>
 				<template v-if="announcements.length == 0">{{ $t('have-a-nice-day') }}</template>
 			</p>
 			<a v-if="announcements.length > 1" @click="next">{{ $t('next') }} &gt;&gt;</a>

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/script.ts

@@ -156,7 +156,11 @@ init(async (launch, os) => {
 					{ path: '/explore', name: 'explore', component: () => import('../common/views/pages/explore.vue').then(m => m.default) },
 					{ path: '/explore/tags/:tag', name: 'explore-tag', props: true, component: () => import('../common/views/pages/explore.vue').then(m => m.default) },
 					{ path: '/i/favorites', component: () => import('./views/home/favorites.vue').then(m => m.default) },
+					{ path: '/i/pages', component: () => import('./views/home/pages.vue').then(m => m.default) },
 				]},
+			{ path: '/@:user/pages/:page', props: true, component: () => import('./views/pages/page.vue').then(m => m.default) },
+			{ path: '/i/pages/new', component: () => import('./views/pages/page-editor.vue').then(m => m.default) },
+			{ path: '/i/pages/edit/:page', props: true, component: () => import('./views/pages/page-editor.vue').then(m => m.default) },
 			{ path: '/i/messaging/:user', component: MkMessagingRoom },
 			{ path: '/i/drive', component: MkDrive },
 			{ path: '/i/drive/folder/:folder', component: MkDrive },

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

@@ -105,9 +105,9 @@ export default Vue.extend({
 			this.init();
 		},
 
-		init() {
+		async init() {
 			this.fetching = true;
-			this.makePromise().then(x => {
+			await (this.makePromise()).then(x => {
 				if (Array.isArray(x)) {
 					this.notes = x;
 				} else {
@@ -122,8 +122,8 @@ export default Vue.extend({
 			});
 		},
 
-		fetchMore() {
-			if (!this.more || this.moreFetching) return;
+		async fetchMore() {
+			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

@@ -228,7 +228,7 @@ export default Vue.extend({
 				const draft = JSON.parse(localStorage.getItem('drafts') || '{}')[this.draftId];
 				if (draft) {
 					this.text = draft.data.text;
-					this.files = draft.data.files;
+					this.files = (draft.data.files || []).filter(e => e);
 					if (draft.data.poll) {
 						this.poll = true;
 						this.$nextTick(() => {
@@ -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

@@ -9,35 +9,42 @@
 			<ul>
 				<li>
 					<router-link :to="`/@${ $store.state.i.username }`">
-						<i><fa icon="user"/></i>
+						<i><fa icon="user" fixed-width/></i>
 						<span>{{ $t('profile') }}</span>
 						<i><fa icon="angle-right"/></i>
 					</router-link>
 				</li>
 				<li @click="drive">
 					<p>
-						<i><fa icon="cloud"/></i>
+						<i><fa icon="cloud" fixed-width/></i>
 						<span>{{ $t('@.drive') }}</span>
 						<i><fa icon="angle-right"/></i>
 					</p>
 				</li>
 				<li>
 					<router-link to="/i/favorites">
-						<i><fa icon="star"/></i>
+						<i><fa icon="star" fixed-width/></i>
 						<span>{{ $t('@.favorites') }}</span>
 						<i><fa icon="angle-right"/></i>
 					</router-link>
 				</li>
 				<li @click="list">
 					<p>
-						<i><fa icon="list"/></i>
+						<i><fa icon="list" fixed-width/></i>
 						<span>{{ $t('lists') }}</span>
 						<i><fa icon="angle-right"/></i>
 					</p>
 				</li>
+				<li @click="page">
+					<router-link to="/i/pages">
+						<i><fa :icon="faStickyNote" fixed-width/></i>
+						<span>{{ $t('@.pages') }}</span>
+						<i><fa icon="angle-right"/></i>
+					</router-link>
+				</li>
 				<li @click="followRequests" v-if="($store.state.i.isLocked || $store.state.i.carefulBot)">
 					<p>
-						<i><fa :icon="['far', 'envelope']"/></i>
+						<i><fa :icon="['far', 'envelope']" fixed-width/></i>
 						<span>{{ $t('follow-requests') }}<i v-if="$store.state.i.pendingReceivedFollowRequestsCount">{{ $store.state.i.pendingReceivedFollowRequestsCount }}</i></span>
 						<i><fa icon="angle-right"/></i>
 					</p>
@@ -46,14 +53,14 @@
 			<ul>
 				<li>
 					<router-link to="/i/settings">
-						<i><fa icon="cog"/></i>
+						<i><fa icon="cog" fixed-width/></i>
 						<span>{{ $t('@.settings') }}</span>
 						<i><fa icon="angle-right"/></i>
 					</router-link>
 				</li>
 				<li v-if="$store.state.i.isAdmin || $store.state.i.isModerator">
 					<a href="/admin">
-						<i><fa icon="terminal"/></i>
+						<i><fa icon="terminal" fixed-width/></i>
 						<span>{{ $t('admin') }}</span>
 						<i><fa icon="angle-right"/></i>
 					</a>
@@ -76,7 +83,7 @@
 			<ul>
 				<li @click="signout">
 					<p class="signout">
-						<i><fa icon="power-off"/></i>
+						<i><fa icon="power-off" fixed-width/></i>
 						<span>{{ $t('@.signout') }}</span>
 					</p>
 				</li>
@@ -90,20 +97,19 @@
 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';
-import { faMoon, faSun } from '@fortawesome/free-regular-svg-icons';
+import { faMoon, faSun, faStickyNote } from '@fortawesome/free-regular-svg-icons';
 
 export default Vue.extend({
 	i18n: i18n('desktop/views/components/ui.header.account.vue'),
 	data() {
 		return {
 			isOpen: false,
-			faHome, faColumns, faMoon, faSun
+			faHome, faColumns, faMoon, faSun, faStickyNote
 		};
 	},
 	computed: {
@@ -143,12 +149,7 @@ export default Vue.extend({
 		},
 		list() {
 			this.close();
-			const w = this.$root.new(MkUserListsWindow);
-			w.$once('choosen', list => {
-				this.$root.new(MkUserListWindow, {
-					list
-				});
-			});
+			this.$root.new(MkUserListsWindow);
 		},
 		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();
-			if (q.startsWith('@')) {
-				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
-				}
+			search(this, this.q).finally(() => {
 				this.wait = false;
-			} else {
-				this.$router.push(`/search?q=${encodeURIComponent(q)}`);
-			}
+				this.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);
-			w.$once('choosen', list => {
-				this.$router.push(`i/lists/${ list.id }`);
-			});
+			this.$root.new(MkUserListsWindow);
 		},
 
 		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.i.wallpaperUrl })`
+				backgroundImage: `url(${ this.$store.state.settings.wallpaper })`
 			};
 		},
 
@@ -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>
-
-	<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>
+	<x-lists :class="$style.content" @choosen="choosen"/>
 </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() {
-		return {
-			fetching: true,
-			lists: []
-		};
-	},
-	mounted() {
-		this.$root.api('users/lists/list').then(lists => {
-			this.fetching = false;
-			this.lists = lists;
-		});
+	components: {
+		XLists: () => import('../../../common/views/components/user-lists.vue').then(m => m.default)
 	},
 	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>
-.xkxvokkjlptzyewouewmceqcxhpgzprp
-	padding 16px
-
-	> 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 lang="stylus" module>
+.content
+	height 100%
+	overflow auto
 
 </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/pages.vue

@@ -0,0 +1,92 @@
+<template>
+<div class="rknalgpo" v-if="!fetching">
+	<ui-button @click="create()"><fa :icon="faPlus"/></ui-button>
+	<sequential-entrance animation="entranceFromTop" delay="25">
+		<template v-for="page in pages">
+			<x-page-preview class="page" :page="page" :key="page.id"/>
+		</template>
+	</sequential-entrance>
+	<ui-button v-if="existMore" @click="fetchMore()">{{ $t('@.load-more') }}</ui-button>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../i18n';
+import Progress from '../../../common/scripts/loading';
+import { faPlus } from '@fortawesome/free-solid-svg-icons';
+import { faStickyNote } from '@fortawesome/free-regular-svg-icons';
+import XPagePreview from '../../../common/views/components/page-preview.vue';
+
+export default Vue.extend({
+	i18n: i18n(),
+	components: {
+		XPagePreview
+	},
+	data() {
+		return {
+			fetching: true,
+			pages: [],
+			existMore: false,
+			moreFetching: false,
+			faStickyNote, faPlus
+		};
+	},
+	created() {
+		this.fetch();
+	},
+	methods: {
+		fetch() {
+			Progress.start();
+			this.fetching = true;
+
+			this.$root.api('i/pages', {
+				limit: 11
+			}).then(pages => {
+				if (pages.length == 11) {
+					this.existMore = true;
+					pages.pop();
+				}
+
+				this.pages = pages;
+				this.fetching = false;
+
+				Progress.done();
+			});
+		},
+		fetchMore() {
+			this.moreFetching = true;
+			this.$root.api('i/pages', {
+				limit: 11,
+				untilId: this.pages[this.pages.length - 1].id
+			}).then(pages => {
+				if (pages.length == 11) {
+					this.existMore = true;
+					pages.pop();
+				} else {
+					this.existMore = false;
+				}
+
+				this.pages = this.pages.concat(pages);
+				this.moreFetching = false;
+			});
+		},
+		create() {
+			this.$router.push(`/i/pages/new`);
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.rknalgpo
+	margin 0 auto
+
+	> * > .page
+		margin-bottom 8px
+
+	@media (min-width 500px)
+		> * > .page
+			margin-bottom 16px
+
+</style>

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

@@ -14,6 +14,7 @@
 import Vue from 'vue';
 import i18n from '../../../i18n';
 import Progress from '../../../common/scripts/loading';
+import { genSearchQuery } from '../../../common/scripts/gen-search-query';
 
 const limit = 20;
 
@@ -21,10 +22,10 @@ export default Vue.extend({
 	i18n: i18n('desktop/views/pages/search.vue'),
 	data() {
 		return {
-			makePromise: cursor => this.$root.api('notes/search', {
+			makePromise: async cursor => this.$root.api('notes/search', {
 				limit: limit + 1,
 				offset: cursor ? cursor : undefined,
-				query: this.q
+				...(await genSearchQuery(this, this.q))
 			}).then(notes => {
 				if (notes.length == limit + 1) {
 					notes.pop();