Merge branch 'develop'

#4809

.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'
 
 #   ┌─────────────────────┐

.gitignore

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

.node-version

@@ -1 +1 @@
-v11.7.0
+v12.1.0

CHANGELOG.md

@@ -5,8 +5,46 @@ 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`)
 
+Migration
+------------------------------
+#### 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
+```
+
 How to migrate to v11 from v10
 ------------------------------
+### 移行の注意点
+**以下のデータは引き継がれません**
+* 通知
+* リモートの投稿
+* リバーシの対局
+
+### 手順
 1. v11をインストールしたい場所に syuilo/misskey をクローン
 2. config を設定する
 	* PostgreSQL(`db`)の設定とは別に、v10からMongoDBの設定をコピペしてくる(例は下にあります)
@@ -35,6 +73,149 @@ mongodb:
 8. master ブランチに戻す
 9. enjoy
 
+11.11.0 (2019/05/05)
+--------------------
+### Improvements
+* MisskeyPagesにリストから選択関数を追加
+* MisskeyPagesに確率を指定できるテキストランダム選択関数を追加
+* 外部サービス連携ログインリンクにアイコン追加
+
+### Fixes
+* MisskeyPagesでifを入れ子にできなくなっていた問題を修正
+* MisskeyPagesで数値入力を作成するとテキスト入力になる問題を修正
+* 外部サービス連携に関する問題を修正
+
+11.10.1 (2019/05/04)
+--------------------
+### Fixes
+* MisskeyPagesでページブロックを削除できなくなっていた問題を修正
+
+### その他
+* Node.js v12対応
+
+11.10.0 (2019/05/03)
+--------------------
+### 注意
+このアップデートを適用した後、プロセスを起動(もしくは再起動)する前に[マイグレーション](#migration)の手順を実行してください
+
+### Improvements
+* MisskeyPagesに割った余りを求める関数を追加
+* Mastodon v2.8.0 のフォローリストをインポートできるように
+* エクスポートリクエストに失敗したらエラーを表示するように
+* エクスポートファイルでは同一ハッシュチェックをしないように
+
+### Fixes
+* 2段階認証を設定するとログインできなくなる問題を修正
+* ファイルをアップロードできないことがある問題を修正
+* リモートファイルをキャッシュしない設定だとサムネイル時にオリジナル画像が表示されない問題を修正
+* 外部サービス連携の不具合を修正
+
+11.9.0 (2019/05/02)
+-------------------
+### Improvements
+* MisskeyPagesで編集時にページブロックをドラッグで並べ替えられるように
+* MisskeyPagesにカウンターボタンブロックを追加
+
+11.8.1 (2019/05/02)
+-------------------
+### Fixes
+* リモートファイルをキャッシュしないオプション有効時にファイルが作成できない問題を修正
+
+11.8.0-2 (2019/05/01)
+-------------------
+* 11.8.0 のリリース内容が 11.7.0 と同一だったのを修正
+
+11.8.0 (2019/05/01)
+-------------------
+### Improvements
+* MisskeyPagesで関数を作成できるように
+* MisskeyPagesでソースを表示できるように
+* MisskeyPagesにシードを与えるランダム関数を追加
+* MisskeyPagesに複数行テキストをテキストのリストに変換する関数を追加
+
+### Fixes
+* APIドキュメントが見れなくなっていたのを修正
+* mention (あなた宛て) streaming にミュートが効かない問題を修正
+* デザインの調整
+
+11.7.0 (2019/04/30)
+-------------------
+### Improvements
+* MisskeyPagesに ifブロック を追加
+* MisskeyPagesに テキストエリア を追加
+* MisskeyPagesに 複数行テキスト入力 を追加
+* MisskeyPagesに 投稿フォーム を追加
+* MisskeyPagesに 変換系関数 を追加
+* MisskeyPagesに 環境変数 URL を追加
+* MisskeyPagesでボタンやスイッチなどのテキストに変数使えるように
+
+### Fixes
+* OGPのサイト名を修正
+* デザインの調整
+
+11.6.0 (2019/04/29)
+-------------------
+### Improvements
+* AiScriptにいくつかの文字列操作関数を追加
+* ページ編集画面にページへのリンクを表示するように
+
+### Fixes
+* MisskeyPagesで数値入力が文字列として扱われる問題を修正
+* デザインの調整
+
+11.5.1 (2019/04/29)
+-------------------
+### Fixes
+* MisskeyPagesで環境変数を別の変数内で使えない問題を修正
+* MisskeyPagesで値が0の変数が表示されない問題を修正
+
+11.5.0 (2019/04/29)
+-------------------
+### 注意
+このアップデートを適用した後、プロセスを起動(もしくは再起動)する前に[マイグレーション](migration)の手順を実行してください
+
+### 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

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:11-alpine AS base
+FROM node:12.1-alpine AS base
 
 ENV NODE_ENV=production
 

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>
@@ -118,10 +118,10 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <td><a href="https://www.patreon.com/user?u=16869916">見当かなみ</a></td>
 </tr></table>
 <table><tr>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/18899730/6a22797f68254034a854d69ea2445fc8/1.png?token-time=2145916800&token-hash=b_uj57yxo5VzkSOUS7oXE_762dyOTB_oxzbO6lFNG3k%3D" alt="YuzuRyo61" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12021162/963128bb8d14476dbd8407943db8f31a/1.png?token-time=2145916800&token-hash=FMV7cPKBD1TU2WTbl1jg6AcdKSvTb2BSFcDhgc-EO8w%3D" alt="gutfuckllc" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/11357794/923ce94cd8c44ba788ee931907881839/1.png?token-time=2145916800&token-hash=9nEQje_eMvUjq9a7L3uBqW-MQbS-rRMaMgd7UYVoFNM%3D" alt="mydarkstar" width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/12718187" alt="Peter G." width="100"></td>
-<td><img src="https://c8.patreon.com/2/200/18833336" alt="itiradi" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13039004/509d0c412eb14ae08d6a812a3054f7d6/1.jpe?token-time=2145916800&token-hash=UQRWf01TwHDV4Cls1K0YAOAjM29ssif7hLVq0ESQ0hs%3D" alt="nemu" width="100"></td>
 <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>
@@ -129,10 +129,10 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <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>
 </tr><tr>
+<td><a href="https://www.patreon.com/Yuzulia">YuzuRyo61</a></td>
 <td><a href="https://www.patreon.com/gutfuckllc">gutfuckllc</a></td>
 <td><a href="https://www.patreon.com/mydarkstar">mydarkstar</a></td>
 <td><a href="https://www.patreon.com/user?u=12718187">Peter G.</a></td>
-<td><a href="https://www.patreon.com/user?u=18833336">itiradi</a></td>
 <td><a href="https://www.patreon.com/user?u=13039004">nemu</a></td>
 <td><a href="https://www.patreon.com/user?u=17866454">sikyosyounin</a></td>
 <td><a href="https://www.patreon.com/yukimochi">YUKIMOCHI</a></td>
@@ -146,28 +146,30 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <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/2384390/5681180e1efb46a8b28e0e8d4c8b9037/1.jpg?token-time=2145916800&token-hash=SJcMy-Q1BcS940-LFUVOMfR7-5SgrzsEQGhYb3yowFk%3D" alt="CG" 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>
 </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>
 <td><a href="https://www.patreon.com/hiratake">Hiratake</a></td>
+<td><a href="https://www.patreon.com/Corset">CG</a></td>
 <td><a href="https://www.patreon.com/hekovic">Hekovic</a></td>
 <td><a href="https://www.patreon.com/dansup">dansup</a></td>
 <td><a href="https://www.patreon.com/mastodon">Gargron</a></td>
-<td><a href="https://www.patreon.com/takenoko">Nokotaro Takeda</a></td>
 </tr></table>
 <table><tr>
+<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/takenoko">Nokotaro Takeda</a></td>
 <td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
 </tr></table>
 
-**Last updated:** Wed, 24 Apr 2019 05:56:07 UTC
+**Last updated:** Fri, 03 May 2019 05:33:07 UTC
 <!-- PATREON_END -->
 
 :four_leaf_clover: Copyright

locales/ja-JP.yml

@@ -65,6 +65,7 @@ common:
 
   trash: "ゴミ箱"
   drive: "ドライブ"
+  pages: "ページ"
   messaging: "トーク"
   home: "ホーム"
   deck: "デッキ"
@@ -1813,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: "アプリの管理"
 
@@ -1857,3 +1838,264 @@ dev/views/new-app.vue:
   authority: "権限"
   authority-desc: "ここで要求した機能だけがAPIからアクセスできます。"
   authority-warning: "アプリ作成後も変更できますが、新たな権限を付与する場合、その時点で関連付けられているユーザーキーはすべて無効になります。"
+
+pages:
+  new-page: "ページの作成"
+  edit-page: "ページの編集"
+  read-page: "ソースを表示中"
+  page-created: "ページを作成しました"
+  page-updated: "ページを更新しました"
+  are-you-sure-delete: "このページを削除しますか？"
+  page-deleted: "ページを削除しました"
+  edit-this-page: "このページを編集"
+  view-source: "ソースを表示"
+  view-page: "ページを見る"
+  inspector: "インスペクター"
+  content: "ページブロック"
+  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: "ユーザーからの入力を受け取るには、ページに「ユーザー入力」ブロックを設置し、「変数名」に入力を格納したい変数名を設定します(変数は自動で作成されます)。その変数を使ってユーザー入力に応じた動作を行えます。"
+  variables-info4: "関数を使うと、値の算出処理を再利用可能な形にまとめることができます。関数を作るには、「関数」タイプの変数を作成します。関数にはスロット(引数)を設定することができ、スロットの値は関数内で変数として利用可能です。また、AiScript標準で関数を引数に取る関数(高階関数と呼ばれます)も存在します。関数は予め定義しておくほかに、このような高階関数のスロットに即席でセットすることもできます。"
+  more-details: "詳しい説明"
+  title: "タイトル"
+  url: "ページURL"
+  summary: "ページの要約"
+  align-center: "中央寄せ"
+  font: "フォント"
+  fontSerif: "セリフ"
+  fontSansSerif: "サンセリフ"
+  set-eye-catching-image: "アイキャッチ画像を設定"
+  remove-eye-catching-image: "アイキャッチ画像を削除"
+  choose-block: "ブロックを追加"
+  select-type: "種類を選択"
+  enter-variable-name: "変数名を決めてください"
+  the-variable-name-is-already-used: "その変数名は既に使われています"
+  content-blocks: "コンテンツ"
+  input-blocks: "入力"
+  special-blocks: "特殊"
+  post-from-post-form: "この内容を投稿"
+  posted-from-post-form: "投稿しました"
+  blocks:
+    text: "テキスト"
+    textarea: "テキストエリア"
+    section: "セクション"
+    image: "画像"
+    button: "ボタン"
+
+    if: "もし"
+    _if:
+      variable: "変数"
+
+    post: "投稿フォーム"
+    _post:
+      text: "内容"
+
+    textInput: "テキスト入力"
+    _textInput:
+      name: "変数名"
+      text: "タイトル"
+      default: "デフォルト値"
+
+    textareaInput: "複数行テキスト入力"
+    _textareaInput:
+      name: "変数名"
+      text: "タイトル"
+      default: "デフォルト値"
+
+    numberInput: "数値入力"
+    _numberInput:
+      name: "変数名"
+      text: "タイトル"
+      default: "デフォルト値"
+
+    switch: "スイッチ"
+    _switch:
+      name: "変数名"
+      text: "タイトル"
+      default: "デフォルト値"
+
+    counter: "カウンター"
+    _counter:
+      name: "変数名"
+      text: "タイトル"
+      inc: "増加値"
+
+    _button:
+      text: "タイトル"
+      action: "ボタンを押したときの動作"
+      _action:
+        dialog: "ダイアログを表示する"
+        _dialog:
+          content: "内容"
+        resetRandom: "乱数をリセット"
+
+  script:
+    categories:
+      flow: "制御"
+      logical: "論理演算"
+      operation: "計算"
+      comparison: "比較"
+      random: "ランダム"
+      value: "値"
+      fn: "関数"
+      text: "テキスト操作"
+      convert: "変換"
+      list: "リスト"
+    blocks:
+      text: "テキスト"
+      multiLineText: "テキスト(複数行)"
+      textList: "テキストのリスト"
+      _textList:
+        info: "ひとつひとつを改行で区切ってください"
+      strLen: "テキストの長さ"
+      _strLen:
+        arg1: "テキスト"
+      strPick: "文字取り出し"
+      _strPick:
+        arg1: "テキスト"
+        arg2: "文字の位置"
+      strReplace: "テキスト置き換え"
+      _strReplace:
+        arg1: "テキスト"
+        arg2: "置き換え前"
+        arg3: "置き換え後"
+      strReverse: "テキストを反転"
+      _strReverse:
+        arg1: "テキスト"
+      join: "テキストを連結"
+      _join:
+        arg1: "リスト"
+        arg2: "区切り"
+      add: "+ 足す"
+      _add:
+        arg1: "A"
+        arg2: "B"
+      subtract: "- 引く"
+      _subtract:
+        arg1: "A"
+        arg2: "B"
+      multiply: "× 掛ける"
+      _multiply:
+        arg1: "A"
+        arg2: "B"
+      divide: "÷ 割る"
+      _divide:
+        arg1: "A"
+        arg2: "B"
+      remind: "÷ 割った余り"
+      _remind:
+        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: "リスト"
+      seedRandom: "ランダム (シード)"
+      _seedRandom:
+        arg1: "シード"
+        arg2: "確率"
+      seedRannum: "乱数 (シード)"
+      _seedRannum:
+        arg1: "シード"
+        arg2: "最小"
+        arg3: "最大"
+      seedRandomPick: "リストからランダムに選択 (シード)"
+      _seedRandomPick:
+        arg1: "シード"
+        arg2: "リスト"
+      DRPWPM: "確率付きリストからランダムに選択 (ユーザーごとに日替わり)"
+      _DRPWPM:
+        arg1: "テキストのリスト"
+      pick: "リストから選択"
+      _pick:
+        arg1: "リスト"
+        arg2: "位置"
+      number: "数値"
+      stringToNumber: "テキストを数値に"
+      _stringToNumber:
+        arg1: "テキスト"
+      numberToString: "数値をテキストに"
+      _numberToString:
+        arg1: "数値"
+      splitStrByLine: "テキストを行で分割"
+      _splitStrByLine:
+        arg1: "テキスト"
+      ref: "変数"
+      fn: "関数"
+      _fn:
+        slots: "スロット"
+        slots-info: "スロットひとつひとつを改行で区切ってください"
+        arg1: "出力"
+      for: "繰り返し"
+      _for:
+        arg1: "回数"
+        arg2: "処理"
+    typeError: "スロット{slot}は\"{expect}\"を受け付けますが、\"{actual}\"が入れられています！"
+    thereIsEmptySlot: "スロット{slot}が空です！"
+    types:
+      string: "テキスト"
+      number: "数値"
+      boolean: "フラグ"
+      array: "リスト"
+      stringArray: "テキストのリスト"
+    emptySlot: "空のスロット"
+    enviromentVariables: "環境変数"
+    pageVariables: "ページ要素"
+    argVariables: "入力スロット"

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"`);
+    }
+
+}

migration/1556746559567-UserProfile.ts

@@ -0,0 +1,23 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class UserProfile1556746559567 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`UPDATE "user_profile" SET github = FALSE`);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "githubId"`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD COLUMN "githubId" VARCHAR(64)`);
+        await queryRunner.query(`UPDATE "user_profile" SET discord = FALSE`);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "discordExpiresDate"`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD COLUMN "discordExpiresDate" VARCHAR(64)`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`UPDATE "user_profile" SET github = FALSE`);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "githubId"`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD COLUMN "githubId" INTEGER`);
+        await queryRunner.query(`UPDATE "user_profile" SET discord = FALSE`);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "discordExpiresDate"`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD COLUMN "discordExpiresDate" INTEGER`);
+    }
+
+}

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.3.0",
+	"version": "11.11.0",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",
@@ -23,6 +23,7 @@
 		"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",
@@ -35,7 +36,6 @@
 		"@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",
@@ -63,8 +63,8 @@
 		"@types/lolex": "3.1.1",
 		"@types/minio": "7.0.1",
 		"@types/mocha": "5.2.6",
-		"@types/node": "11.13.4",
-		"@types/nodemailer": "4.6.7",
+		"@types/node": "11.13.8",
+		"@types/nodemailer": "4.6.8",
 		"@types/nprogress": "0.0.29",
 		"@types/oauth": "0.9.1",
 		"@types/parse5": "5.0.0",
@@ -77,9 +77,10 @@
 		"@types/redis": "2.8.12",
 		"@types/rename": "1.0.1",
 		"@types/request": "2.48.1",
-		"@types/request-promise-native": "1.0.15",
+		"@types/request-promise-native": "1.0.16",
 		"@types/request-stats": "3.0.0",
 		"@types/rimraf": "2.0.2",
+		"@types/seedrandom": "2.4.28",
 		"@types/sharp": "0.22.1",
 		"@types/showdown": "1.9.2",
 		"@types/speakeasy": "2.0.4",
@@ -88,18 +89,18 @@
 		"@types/tmp": "0.1.0",
 		"@types/uuid": "3.4.4",
 		"@types/web-push": "3.3.0",
-		"@types/webpack": "4.4.27",
+		"@types/webpack": "4.4.29",
 		"@types/webpack-stream": "3.2.10",
 		"@types/websocket": "0.0.40",
 		"@types/ws": "6.0.1",
 		"animejs": "3.0.1",
-		"apexcharts": "3.6.8",
+		"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",
@@ -111,17 +112,16 @@
 		"cssnano": "4.1.10",
 		"dateformat": "3.0.3",
 		"deep-equal": "1.0.1",
-		"diskusage": "1.1.0",
+		"diskusage": "1.1.1",
 		"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",
-		"eventemitter3": "3.1.0",
+		"eventemitter3": "3.1.2",
 		"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",
@@ -140,7 +140,7 @@
 		"is-root": "2.1.0",
 		"is-svg": "4.1.0",
 		"js-yaml": "3.13.1",
-		"jsdom": "14.1.0",
+		"jsdom": "15.0.0",
 		"json5": "2.1.0",
 		"json5-loader": "2.0.0",
 		"katex": "0.10.1",
@@ -160,13 +160,13 @@
 		"loader-utils": "1.2.3",
 		"lolex": "3.1.0",
 		"lookup-dns-cache": "2.1.0",
-		"minio": "7.0.6",
-		"mocha": "6.1.3",
+		"minio": "7.0.8",
+		"mocha": "6.1.4",
 		"moji": "0.5.1",
 		"moment": "2.24.0",
 		"ms": "2.1.1",
 		"nested-property": "0.0.7",
-		"node-fetch": "2.3.0",
+		"node-fetch": "2.5.0",
 		"nodemailer": "6.1.1",
 		"nprogress": "0.2.0",
 		"object-assign-deep": "0.4.0",
@@ -200,7 +200,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",
@@ -209,7 +210,7 @@
 		"stylus": "0.54.5",
 		"stylus-loader": "3.0.2",
 		"summaly": "2.2.0",
-		"systeminformation": "4.1.5",
+		"systeminformation": "4.1.6",
 		"syuilo-password-strength": "0.0.1",
 		"terser-webpack-plugin": "1.2.3",
 		"textarea-caret": "3.1.0",
@@ -233,8 +234,8 @@
 		"vue-color": "2.7.0",
 		"vue-content-loading": "1.6.0",
 		"vue-cropperjs": "3.0.0",
-		"vue-i18n": "8.10.0",
-		"vue-js-modal": "1.3.28",
+		"vue-i18n": "8.11.2",
+		"vue-js-modal": "1.3.31",
 		"vue-json-pretty": "1.6.0",
 		"vue-loader": "15.7.0",
 		"vue-marquee-text-component": "1.1.1",
@@ -250,9 +251,9 @@
 		"vuex-persistedstate": "2.5.4",
 		"web-push": "3.3.3",
 		"webpack": "4.30.0",
-		"webpack-cli": "3.3.0",
+		"webpack-cli": "3.3.1",
 		"websocket": "1.0.28",
-		"ws": "6.2.1",
+		"ws": "7.0.0",
 		"xev": "2.0.1"
 	}
 }

src/client/app/app.styl

@@ -34,7 +34,7 @@ body
 	.peg
 		display block
 		position absolute
-		right 0px
+		right 0
 		width 100px
 		height 100%
 		box-shadow 0 0 10px var(--primary), 0 0 5px var(--primary)

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

@@ -98,7 +98,7 @@ export default Vue.extend({
 		margin 0 auto
 		text-align center
 		background #fff
-		box-shadow 0px 4px 16px rgba(#000, 0.2)
+		box-shadow 0 4px 16px rgba(#000, 0.2)
 
 		> .fetching
 			margin 0

src/client/app/common/hotkey.ts

@@ -52,7 +52,7 @@ function match(e: KeyboardEvent, patterns: action['patterns']): boolean {
 		pattern.ctrl == e.ctrlKey &&
 		pattern.shift == e.shiftKey &&
 		pattern.alt == e.altKey &&
-		e.metaKey == false
+		!e.metaKey
 	);
 }
 

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

@@ -0,0 +1,42 @@
+export function collectPageVars(content) {
+	const pageVars = [];
+	const collect = (xs: any[]) => {
+		for (const x of xs) {
+			if (x.type === 'textInput') {
+				pageVars.push({
+					name: x.name,
+					type: 'string',
+					value: x.default || ''
+				});
+			} else if (x.type === 'textareaInput') {
+				pageVars.push({
+					name: x.name,
+					type: 'string',
+					value: x.default || ''
+				});
+			} else if (x.type === 'numberInput') {
+				pageVars.push({
+					name: x.name,
+					type: 'number',
+					value: x.default || 0
+				});
+			} else if (x.type === 'switch') {
+				pageVars.push({
+					name: x.name,
+					type: 'boolean',
+					value: x.default || false
+				});
+			} else if (x.type === 'counter') {
+				pageVars.push({
+					name: x.name,
+					type: 'number',
+					value: 0
+				});
+			} 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/search.ts

@@ -3,7 +3,7 @@ import { faHistory } from '@fortawesome/free-solid-svg-icons';
 export async function search(v: any, q: string) {
 	q = q.trim();
 
-	if (q.startsWith('@')) {
+	if (q.startsWith('@') && !q.includes(' ')) {
 		v.$router.push(`/${q}`);
 		return;
 	}

src/client/app/common/scripts/should-mute-note.ts

@@ -11,9 +11,9 @@ export default function(me, settings, note) {
 	return (
 		(!isMyNote && note.reply && includesMutedWords(note.reply.text)) ||
 		(!isMyNote && note.renote && includesMutedWords(note.renote.text)) ||
-		(settings.showMyRenotes === false && isMyNote && isPureRenote) ||
-		(settings.showRenotedMyNotes === false && isPureRenote && note.renote.userId == me.id) ||
-		(settings.showLocalRenotes === false && isPureRenote && note.renote.user.host == null) ||
+		(!settings.showMyRenotes && isMyNote && isPureRenote) ||
+		(!settings.showRenotedMyNotes && isPureRenote && note.renote.userId == me.id) ||
+		(!settings.showLocalRenotes && isPureRenote && note.renote.user.host == null) ||
 		(!isMyNote && includesMutedWords(note.text))
 	);
 }

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

@@ -80,7 +80,7 @@ export default Vue.extend({
 
 		ms(): number {
 			return this.now.getMilliseconds() * this.smooth;
-		}
+		},
 		s(): number {
 			return this.now.getSeconds();
 		},

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

@@ -1,7 +1,7 @@
 <template>
 <div class="felqjxyj" :class="{ splash }">
 	<div class="bg" ref="bg" @click="onBgClick"></div>
-	<div class="main" ref="main">
+	<div class="main" ref="main" :class="{ round: $store.state.device.roundedCorners }">
 		<template v-if="type == 'signin'">
 			<mk-signin/>
 		</template>
@@ -22,7 +22,14 @@
 			<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>
-				<option v-for="item in select.items" :value="item.value">{{ item.text }}</option>
+				<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 && (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>
@@ -222,15 +229,17 @@ export default Vue.extend({
 		width calc(100% - 32px)
 		text-align center
 		background var(--face)
-		border-radius 8px
 		color var(--faceText)
 		opacity 0
 
+		&.round
+			border-radius 8px
+
 		> .icon
 			font-size 32px
 
 			&.success
-				color #37ec92
+				color #85da5a
 
 			&.error
 				color #ec4137

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/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>
@@ -202,7 +202,7 @@ export default Vue.extend({
 		left 0
 		z-index 1
 		width 100%
-		box-shadow 0 0px 2px rgba(#000, 0.2)
+		box-shadow 0 0 2px rgba(#000, 0.2)
 
 		> .form
 			background rgba(0, 0, 0, 0.02)

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

@@ -0,0 +1,54 @@
+<template>
+<x-container @remove="() => $emit('remove')" :draggable="true">
+	<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 { faBolt } from '@fortawesome/free-solid-svg-icons';
+import i18n from '../../../../../i18n';
+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/els/page-editor.el.counter.vue

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

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

@@ -0,0 +1,90 @@
+<template>
+<x-container @remove="() => $emit('remove')" :draggable="true">
+	<template #header><fa :icon="faQuestion"/> {{ $t('blocks.if') }}</template>
+	<template #func>
+		<button @click="add()">
+			<fa :icon="faPlus"/>
+		</button>
+	</template>
+
+	<section class="romcojzs">
+		<ui-select v-model="value.var">
+			<template #label>{{ $t('blocks._if.variable') }}</template>
+			<option v-for="v in aiScript.getVarsByType('boolean')" :value="v.name">{{ v.name }}</option>
+			<optgroup :label="$t('script.pageVariables')">
+				<option v-for="v in aiScript.getPageVarsByType('boolean')" :value="v">{{ v }}</option>
+			</optgroup>
+			<optgroup :label="$t('script.enviromentVariables')">
+				<option v-for="v in aiScript.getEnvVarsByType('boolean')" :value="v">{{ v }}</option>
+			</optgroup>
+		</ui-select>
+
+		<x-blocks class="children" v-model="value.children" :ai-script="aiScript"/>
+	</section>
+</x-container>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import * as uuid from 'uuid';
+import { faPlus, faQuestion } from '@fortawesome/free-solid-svg-icons';
+import i18n from '../../../../../i18n';
+import XContainer from '../page-editor.container.vue';
+
+export default Vue.extend({
+	i18n: i18n('pages'),
+
+	components: {
+		XContainer
+	},
+
+	inject: ['getPageBlockList'],
+
+	props: {
+		value: {
+			required: true
+		},
+		aiScript: {
+			required: true,
+		},
+	},
+
+	data() {
+		return {
+			faPlus, faQuestion
+		};
+	},
+
+	beforeCreate() {
+		this.$options.components.XBlocks = require('../page-editor.blocks.vue').default
+	},
+
+	created() {
+		if (this.value.children == null) Vue.set(this.value, 'children', []);
+		if (this.value.var === undefined) Vue.set(this.value, 'var', null);
+	},
+
+	methods: {
+		async add() {
+			const { canceled, result: type } = await this.$root.dialog({
+				type: null,
+				title: this.$t('choose-block'),
+				select: {
+					groupedItems: this.getPageBlockList()
+				},
+				showCancelButton: true
+			});
+			if (canceled) return;
+
+			const id = uuid.v4();
+			this.value.children.push({ id, type });
+		},
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.romcojzs
+	padding 0 16px 16px 16px
+
+</style>

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

@@ -0,0 +1,78 @@
+<template>
+<x-container @remove="() => $emit('remove')" :draggable="true">
+	<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 { faPencilAlt } from '@fortawesome/free-solid-svg-icons';
+import { faImage, faFolderOpen } from '@fortawesome/free-regular-svg-icons';
+import i18n from '../../../../../i18n';
+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/els/page-editor.el.number-input.vue

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

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

@@ -0,0 +1,40 @@
+<template>
+<x-container @remove="() => $emit('remove')" :draggable="true">
+	<template #header><fa :icon="faPaperPlane"/> {{ $t('blocks.post') }}</template>
+
+	<section style="padding: 0 16px 16px 16px;">
+		<ui-textarea v-model="value.text">{{ $t('blocks._post.text') }}</ui-textarea>
+	</section>
+</x-container>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import { faPaperPlane } from '@fortawesome/free-regular-svg-icons';
+import i18n from '../../../../../i18n';
+import XContainer from '../page-editor.container.vue';
+
+export default Vue.extend({
+	i18n: i18n('pages'),
+
+	components: {
+		XContainer
+	},
+
+	props: {
+		value: {
+			required: true
+		},
+	},
+
+	data() {
+		return {
+			faPaperPlane
+		};
+	},
+
+	created() {
+		if (this.value.text == null) Vue.set(this.value, 'text', '');
+	},
+});
+</script>

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

@@ -0,0 +1,103 @@
+<template>
+<x-container @remove="() => $emit('remove')" :draggable="true">
+	<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">
+		<x-blocks class="children" v-model="value.children" :ai-script="aiScript"/>
+	</section>
+</x-container>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import * as uuid from 'uuid';
+import { faPlus, faPencilAlt } from '@fortawesome/free-solid-svg-icons';
+import { faStickyNote } from '@fortawesome/free-regular-svg-icons';
+import i18n from '../../../../../i18n';
+import XContainer from '../page-editor.container.vue';
+
+export default Vue.extend({
+	i18n: i18n('pages'),
+
+	components: {
+		XContainer
+	},
+
+	inject: ['getPageBlockList'],
+
+	props: {
+		value: {
+			required: true
+		},
+		aiScript: {
+			required: true,
+		},
+	},
+
+	data() {
+		return {
+			faStickyNote, faPlus, faPencilAlt
+		};
+	},
+
+	beforeCreate() {
+		this.$options.components.XBlocks = require('../page-editor.blocks.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: {
+					groupedItems: this.getPageBlockList()
+				},
+				showCancelButton: true
+			});
+			if (canceled) return;
+
+			const id = uuid.v4();
+			this.value.children.push({ id, type });
+		},
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.ilrvjyvi
+	> .children
+		padding 16px
+
+</style>

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

@@ -0,0 +1,48 @@
+<template>
+<x-container @remove="() => $emit('remove')" :draggable="true">
+	<template #header><fa :icon="faBolt"/> {{ $t('blocks.switch') }}</template>
+
+	<section class="kjuadyyj">
+		<ui-input v-model="value.name"><template #prefix><fa :icon="faMagic"/></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 { faBolt, faMagic } from '@fortawesome/free-solid-svg-icons';
+import i18n from '../../../../../i18n';
+import XContainer from '../page-editor.container.vue';
+
+export default Vue.extend({
+	i18n: i18n('pages'),
+
+	components: {
+		XContainer
+	},
+
+	props: {
+		value: {
+			required: true
+		},
+	},
+
+	data() {
+		return {
+			faBolt, faMagic
+		};
+	},
+
+	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/els/page-editor.el.text-input.vue

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

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

@@ -0,0 +1,58 @@
+<template>
+<x-container @remove="() => $emit('remove')" :draggable="true">
+	<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 { faAlignLeft } from '@fortawesome/free-solid-svg-icons';
+import i18n from '../../../../../i18n';
+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)
+		font-size 14px
+</style>

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

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

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

@@ -0,0 +1,58 @@
+<template>
+<x-container @remove="() => $emit('remove')" :draggable="true">
+	<template #header><fa :icon="faAlignLeft"/> {{ $t('blocks.textarea') }}</template>
+
+	<section class="ihymsbbe">
+		<textarea v-model="value.text"></textarea>
+	</section>
+</x-container>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import { faAlignLeft } from '@fortawesome/free-solid-svg-icons';
+import i18n from '../../../../../i18n';
+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)
+		font-size 14px
+</style>

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

@@ -0,0 +1,65 @@
+<template>
+<x-draggable tag="div" :list="blocks" handle=".drag-handle" :group="{ name: 'blocks' }" animation="150" swap-threshold="0.5">
+	<component v-for="block in blocks" :is="'x-' + block.type" :value="block" @input="updateItem" @remove="() => removeItem(block)" :key="block.id" :ai-script="aiScript"/>
+</x-draggable>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import * as XDraggable from 'vuedraggable';
+import XSection from './els/page-editor.el.section.vue';
+import XText from './els/page-editor.el.text.vue';
+import XTextarea from './els/page-editor.el.textarea.vue';
+import XImage from './els/page-editor.el.image.vue';
+import XButton from './els/page-editor.el.button.vue';
+import XTextInput from './els/page-editor.el.text-input.vue';
+import XTextareaInput from './els/page-editor.el.textarea-input.vue';
+import XNumberInput from './els/page-editor.el.number-input.vue';
+import XSwitch from './els/page-editor.el.switch.vue';
+import XIf from './els/page-editor.el.if.vue';
+import XPost from './els/page-editor.el.post.vue';
+import XCounter from './els/page-editor.el.counter.vue';
+
+export default Vue.extend({
+	components: {
+		XDraggable, XSection, XText, XImage, XButton, XTextarea, XTextInput, XTextareaInput, XNumberInput, XSwitch, XIf, XPost, XCounter
+	},
+
+	props: {
+		value: {
+			type: Array,
+			required: true
+		},
+		aiScript: {
+			required: true,
+		},
+	},
+
+	computed: {
+		blocks() {
+			return this.value;
+		}
+	},
+
+	methods: {
+		updateItem(v) {
+			const i = this.blocks.findIndex(x => x.id === v.id);
+			const newValue = [
+				...this.blocks.slice(0, i),
+				v,
+				...this.blocks.slice(i + 1)
+			];
+			this.$emit('input', newValue);
+		},
+
+		removeItem(el) {
+			const i = this.blocks.findIndex(x => x.id === el.id);
+			const newValue = [
+				...this.blocks.slice(0, i),
+				...this.blocks.slice(i + 1)
+			];
+			this.$emit('input', newValue);
+		},
+	}
+});
+</script>

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

@@ -0,0 +1,146 @@
+<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 v-if="draggable" class="drag-handle">
+				<fa :icon="faBars"/>
+			</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 { faBars } from '@fortawesome/free-solid-svg-icons';
+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
+		},
+		draggable: {
+			type: Boolean,
+			default: false
+		},
+		error: {
+			required: false,
+			default: null
+		},
+		warn: {
+			required: false,
+			default: null
+		}
+	},
+	data() {
+		return {
+			showBody: this.expanded,
+			faTrashAlt, faBars
+		};
+	},
+	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)
+
+			.drag-handle
+				cursor move
+
+	> .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.script-block.vue

@@ -0,0 +1,267 @@
+<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="tbwccoaw">
+		<textarea v-model="value.value" :placeholder="$t('script.blocks._textList.info')"></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.argVariables')">
+				<option v-for="v in fnSlots" :value="v.name">{{ v.name }}</option>
+			</optgroup>
+			<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 === 'fn'" class="" style="padding:0 16px 16px 16px;">
+		<ui-textarea v-model="slots">
+			<span>{{ $t('script.blocks._fn.slots') }}</span>
+			<template #desc>{{ $t('script.blocks._fn.slots-info') }}</template>
+		</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].name" :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 { faPencilAlt, faPlug } from '@fortawesome/free-solid-svg-icons';
+import { isLiteralBlock, funcDefs, blockDefs } from '../../../../../../misc/aiscript/index';
+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 {
+			error: null,
+			warn: null,
+			slots: '',
+			faPencilAlt
+		};
+	},
+
+	computed: {
+		icon(): any {
+			if (this.value.type === null) return null;
+			if (this.value.type.startsWith('fn:')) return faPlug;
+			return blockDefs.find(x => x.type === this.value.type).icon;
+		},
+		typeText(): any {
+			if (this.value.type === null) return null;
+			if (this.value.type.startsWith('fn:')) return this.value.type.split(':')[1];
+			return this.$t(`script.blocks.${this.value.type}`);
+		},
+	},
+
+	watch: {
+		slots() {
+			this.value.value.slots = this.slots.split('\n').map(x => ({
+				name: x,
+				type: null
+			}));
+		}
+	},
+
+	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.map(x => x.name).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 (isLiteralBlock(this.value)) return;
+
+			const empties = [];
+			for (let i = 0; i < 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 < funcDefs[this.value.type].in.length; i++) {
+				const inType = 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.vue

@@ -0,0 +1,473 @@
+<template>
+<div>
+	<div class="gwbmwxkm" :class="{ shadow: $store.state.device.useShadow, round: $store.state.device.roundedCorners }">
+		<header>
+			<div class="title"><fa :icon="faStickyNote"/> {{ readonly ? $t('read-page') : pageId ? $t('edit-page') : $t('new-page') }}</div>
+			<div class="buttons">
+				<button @click="del()" v-if="!readonly"><fa :icon="faTrashAlt"/></button>
+				<button @click="() => showOptions = !showOptions"><fa :icon="faCog"/></button>
+				<button @click="save()" v-if="!readonly"><fa :icon="faSave"/></button>
+			</div>
+		</header>
+
+		<section>
+			<a class="view" v-if="pageId" :href="`/@${ author.username }/pages/${ currentName }`" target="_blank"><fa :icon="faExternalLinkSquareAlt"/> {{ $t('view-page') }}</a>
+
+			<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 }}/@{{ author.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 && !readonly" @click="setEyeCatchingImage()"><fa :icon="faPlus"/> {{ $t('set-eye-catching-image') }}</ui-button>
+					<div v-else-if="eyeCatchingImage">
+						<img :src="eyeCatchingImage.url" :alt="eyeCatchingImage.name"/>
+						<ui-button @click="removeEyeCatchingImage()" v-if="!readonly"><fa :icon="faTrashAlt"/> {{ $t('remove-eye-catching-image') }}</ui-button>
+					</div>
+				</div>
+			</template>
+
+			<x-blocks class="content" v-model="content" :ai-script="aiScript"/>
+
+			<ui-button @click="add()" v-if="!readonly"><fa :icon="faPlus"/></ui-button>
+		</section>
+	</div>
+
+	<ui-container :body-togglable="true">
+		<template #header><fa :icon="faMagic"/> {{ $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" v-if="!readonly"><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>
+				<ui-info><span v-html="$t('variables-info4')"></span></ui-info>
+			</template>
+		</div>
+	</ui-container>
+
+	<ui-container :body-togglable="true" :expanded="false">
+		<template #header><fa :icon="faCode"/> {{ $t('inspector') }}</template>
+		<div style="padding:0 32px 32px 32px;">
+			<ui-textarea :value="JSON.stringify(content, null, 2)" readonly tall>{{ $t('content') }}</ui-textarea>
+			<ui-textarea :value="JSON.stringify(variables, null, 2)" readonly tall>{{ $t('variables') }}</ui-textarea>
+		</div>
+	</ui-container>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import { faICursor, faPlus, faMagic, faCog, faCode, faExternalLinkSquareAlt } from '@fortawesome/free-solid-svg-icons';
+import { faSave, faStickyNote, faTrashAlt } from '@fortawesome/free-regular-svg-icons';
+import i18n from '../../../../i18n';
+import XVariable from './page-editor.script-block.vue';
+import XBlocks from './page-editor.blocks.vue';
+import * as uuid from 'uuid';
+import { blockDefs } from '../../../../../../misc/aiscript/index';
+import { ASTypeChecker } from '../../../../../../misc/aiscript/type-checker';
+import { url } from '../../../../config';
+import { collectPageVars } from '../../../scripts/collect-page-vars';
+
+export default Vue.extend({
+	i18n: i18n('pages'),
+
+	components: {
+		XVariable, XBlocks
+	},
+
+	props: {
+		page: {
+			type: Object,
+			required: false
+		},
+		readonly: {
+			type: Boolean,
+			required: false,
+			default: false
+		},
+	},
+
+	data() {
+		return {
+			author: this.$store.state.i,
+			pageId: null,
+			currentName: 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, faMagic, faCog, faTrashAlt, faExternalLinkSquareAlt, faCode
+		};
+	},
+
+	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 ASTypeChecker();
+
+		this.$watch('variables', () => {
+			this.aiScript.variables = this.variables;
+		}, { deep: true });
+
+		this.$watch('content', () => {
+			this.aiScript.pageVars = collectPageVars(this.content);
+		}, { deep: true });
+
+		if (this.page) {
+			this.author = this.page.user;
+			this.pageId = this.page.id;
+			this.title = this.page.title;
+			this.name = this.page.name;
+			this.currentName = this.page.name;
+			this.summary = this.page.summary;
+			this.font = this.page.font;
+			this.alignCenter = this.page.alignCenter;
+			this.content = this.page.content;
+			this.variables = this.page.variables;
+			this.eyeCatchingImageId = this.page.eyeCatchingImageId;
+		} else {
+			const id = uuid.v4();
+			this.content = [{
+				id,
+				type: 'text',
+				text: 'Hello World!'
+			}];
+		}
+	},
+
+	provide() {
+		return {
+			readonly: this.readonly,
+			getScriptBlockList: this.getScriptBlockList,
+			getPageBlockList: this.getPageBlockList
+		}
+	},
+
+	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.currentName = this.name.trim();
+					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.currentName = this.name.trim();
+					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: {
+					groupedItems: this.getPageBlockList()
+				},
+				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 });
+		},
+
+		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;
+		},
+
+		getPageBlockList() {
+			return [{
+				label: this.$t('content-blocks'),
+				items: [
+					{ value: 'section', text: this.$t('blocks.section') },
+					{ value: 'text', text: this.$t('blocks.text') },
+					{ value: 'image', text: this.$t('blocks.image') },
+					{ value: 'textarea', text: this.$t('blocks.textarea') },
+				]
+			}, {
+				label: this.$t('input-blocks'),
+				items: [
+					{ value: 'button', text: this.$t('blocks.button') },
+					{ value: 'textInput', text: this.$t('blocks.textInput') },
+					{ value: 'textareaInput', text: this.$t('blocks.textareaInput') },
+					{ value: 'numberInput', text: this.$t('blocks.numberInput') },
+					{ value: 'switch', text: this.$t('blocks.switch') },
+					{ value: 'counter', text: this.$t('blocks.counter') }
+				]
+			}, {
+				label: this.$t('special-blocks'),
+				items: [
+					{ value: 'if', text: this.$t('blocks.if') },
+					{ value: 'post', text: this.$t('blocks.post') }
+				]
+			}];
+		},
+
+		getScriptBlockList(type: string = null) {
+			const list = [];
+
+			const blocks = blockDefs.filter(block => type === null || block.out === null || block.out === type || typeof block.out === 'number');
+
+			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
+
+		> .view
+			display inline-block
+			margin 16px 0 0 0
+			font-size 14px
+
+		> .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/settings/api.vue

@@ -14,7 +14,7 @@
 
 	<section>
 		<header><fa icon="terminal"/> {{ $t('console.title') }}</header>
-		<ui-input v-model="endpoint" :datalist="endpoints">
+		<ui-input v-model="endpoint" :datalist="endpoints" @change="onEndpointChange()">
 			<span>{{ $t('console.endpoint') }}</span>
 		</ui-input>
 		<ui-textarea v-model="body">
@@ -80,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/integration.vue

@@ -54,7 +54,11 @@ export default Vue.extend({
 	},
 
 	mounted() {
-		document.cookie = `i=${this.$store.state.i.token}`;
+		if (!document.cookie.match(/i=(\w+)/)) {
+			document.cookie = `i=${this.$store.state.i.token}; path=/;` +
+			` domain=${document.location.hostname}; max-age=31536000;` +
+			(document.location.protocol.startsWith('https') ? ' secure' : '');
+		}
 		this.$watch('$store.state.i', () => {
 			if (this.$store.state.i.twitter) {
 				if (this.twitterForm) this.twitterForm.close();

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

@@ -290,12 +290,17 @@ export default Vue.extend({
 				this.exportTarget == 'mute' ? 'i/export-mute' :
 				this.exportTarget == 'blocking' ? 'i/export-blocking' :
 				this.exportTarget == 'user-lists' ? 'i/export-user-lists' :
-				null, {});
-
-			this.$root.dialog({
-				type: 'info',
-				text: this.$t('export-requested')
-			});
+				null, {}).then(() => {
+					this.$root.dialog({
+						type: 'info',
+						text: this.$t('export-requested')
+					});
+				}).catch((e: any) => {
+					this.$root.dialog({
+						type: 'error',
+						text: e.message
+					});
+				});
 		},
 
 		doImport() {

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

@@ -273,7 +273,7 @@ export default Vue.extend({
 
 		import_() {
 			(this.$refs.file as any).click();
-		}
+		},
 
 		export_() {
 			const blob = new Blob([this.selectedThemeCode], {

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

@@ -15,9 +15,9 @@
 		<template #prefix><fa icon="gavel"/></template>
 	</ui-input>
 	<ui-button type="submit" :disabled="signing">{{ signing ? $t('signing-in') : $t('@.signin') }}</ui-button>
-	<p v-if="meta && meta.enableTwitterIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/twitter`">{{ $t('signin-with-twitter') }}</a></p>
-	<p v-if="meta && meta.enableGithubIntegration"  style="margin: 8px 0;"><a :href="`${apiUrl}/signin/github`">{{ $t('signin-with-github') }}</a></p>
-	<p v-if="meta && meta.enableDiscordIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/discord`">{{ $t('signin-with-discord') /* TODO: Make these layouts better */ }}</a></p>
+	<p v-if="meta && meta.enableTwitterIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/twitter`"><fa :icon="['fab', 'twitter']"/> {{ $t('signin-with-twitter') }}</a></p>
+	<p v-if="meta && meta.enableGithubIntegration"  style="margin: 8px 0;"><a :href="`${apiUrl}/signin/github`"><fa :icon="['fab', 'github']"/> {{ $t('signin-with-github') }}</a></p>
+	<p v-if="meta && meta.enableDiscordIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/discord`"><fa :icon="['fab', 'discord']"/> {{ $t('signin-with-discord') /* TODO: Make these layouts better */ }}</a></p>
 </form>
 </template>
 

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

@@ -1,7 +1,7 @@
 <template>
 <component class="dmtdnykelhudezerjlfpbhgovrgnqqgr"
 	:is="link ? 'a' : 'button'"
-	:class="{ inline, primary, wait }"
+	:class="{ inline, primary, wait, round: $store.state.device.roundedCorners }"
 	:type="type"
 	@click="$emit('click')"
 	@mousedown="onMousedown"
@@ -116,7 +116,6 @@ export default Vue.extend({
 	font-size 16px
 	line-height 24px
 	border none
-	border-radius 6px
 	outline none
 	box-shadow none
 	text-decoration none
@@ -124,6 +123,9 @@ export default Vue.extend({
 	color var(--text)
 	background var(--buttonBg)
 
+	&.round
+		border-radius 6px
+
 	&:not(:disabled):hover
 		background var(--buttonHoverBg)
 
@@ -157,7 +159,9 @@ export default Vue.extend({
 			bottom -5px
 			left -5px
 			border 2px solid var(--primaryAlpha03)
-			border-radius 10px
+
+	&.round:focus:after
+		border-radius 10px
 
 	&:not(.inline) + .dmtdnykelhudezerjlfpbhgovrgnqqgr
 		margin-top 16px
@@ -197,7 +201,6 @@ export default Vue.extend({
 		left 0
 		width 100%
 		height 100%
-		border-radius 6px
 		overflow hidden
 
 		>>> div
@@ -210,6 +213,9 @@ export default Vue.extend({
 			transform scale(1)
 			transition all 0.5s cubic-bezier(0, .5, .5, 1)
 
+	&.round > .ripples
+		border-radius 6px
+
 	&.primary > .ripples >>> div
 		background rgba(0, 0, 0, 0.15)
 

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

@@ -23,6 +23,7 @@
 				@focus="focused = true"
 				@blur="focused = false"
 				@keydown="$emit('keydown', $event)"
+				@change="$emit('change', $event)"
 				:list="id"
 			>
 			<input v-else ref="input"
@@ -38,6 +39,7 @@
 				@focus="focused = true"
 				@blur="focused = false"
 				@keydown="$emit('keydown', $event)"
+				@change="$emit('change', $event)"
 				:list="id"
 			>
 			<datalist :id="id" v-if="datalist">
@@ -60,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>
@@ -182,7 +184,11 @@ export default Vue.extend({
 			this.v = v;
 		},
 		v(v) {
-			this.$emit('input', v);
+			if (this.type === 'number') {
+				this.$emit('input', parseInt(v, 10));
+			} else {
+				this.$emit('input', v);
+			}
 
 			if (this.withPasswordMeter) {
 				if (v == '') {
@@ -316,7 +322,7 @@ root(fill)
 
 			> .value
 				display block
-				width 0%
+				width 0
 				height 100%
 				background transparent
 				border-radius 6px

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.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;
@@ -166,7 +166,7 @@ export default Vue.extend({
 			> .follow-button
 				position absolute
 				top 8px
-				right 0px
+				right 0
 
 	> .more
 		display block

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

@@ -160,7 +160,7 @@ export default Vue.extend({
 				this.$emit('top');
 			}
 
-			if (this.$store.state.settings.fetchOnScroll !== false) {
+			if (this.$store.state.settings.fetchOnScroll) {
 				const current = this.$refs.body.scrollTop + this.$refs.body.clientHeight;
 				if (current > this.$refs.body.scrollHeight - 1) this.$emit('bottom');
 			}

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.user-column.vue

@@ -205,7 +205,7 @@ export default Vue.extend({
 			top -32px
 			left 0
 			right 0
-			width 0px
+			width 0
 			margin 0 auto
 			border-top solid 16px transparent
 			border-left solid 16px transparent

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

@@ -102,7 +102,7 @@ class Autocomplete {
 			}
 		}
 
-		if (isHashtag && opened == false) {
+		if (isHashtag && !opened) {
 			const hashtag = text.substr(hashtagIndex + 1);
 			if (!hashtag.includes(' ')) {
 				this.open('hashtag', hashtag);
@@ -110,7 +110,7 @@ class Autocomplete {
 			}
 		}
 
-		if (isEmoji && opened == false) {
+		if (isEmoji && !opened) {
 			const emoji = text.substr(emojiIndex + 1);
 			if (!emoji.includes(' ')) {
 				this.open('emoji', emoji);

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

@@ -0,0 +1,40 @@
+<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 XNumberInput from './page.number-input.vue';
+import XTextInput from './page.text-input.vue';
+import XTextareaInput from './page.textarea-input.vue';
+import XSwitch from './page.switch.vue';
+import XIf from './page.if.vue';
+import XTextarea from './page.textarea.vue';
+import XPost from './page.post.vue';
+import XCounter from './page.counter.vue';
+
+export default Vue.extend({
+	components: {
+		XText, XSection, XImage, XButton, XNumberInput, XTextInput, XTextareaInput, XTextarea, XPost, XSwitch, XIf, XCounter
+	},
+
+	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()">{{ script.interpolate(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.eval();
+				this.$root.dialog({
+					text: this.script.interpolate(this.value.content)
+				});
+			} else if (this.value.action === 'resetRandom') {
+				this.script.aiScript.updateRandomSeed(Math.random());
+				this.script.eval();
+			}
+		}
+	}
+});
+</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.counter.vue

@@ -0,0 +1,47 @@
+<template>
+<div>
+	<ui-button class="llumlmnx" @click="click()">{{ script.interpolate(value.text) }}</ui-button>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		value: {
+			required: true
+		},
+		script: {
+			required: true
+		}
+	},
+
+	data() {
+		return {
+			v: 0,
+		};
+	},
+
+	watch: {
+		v() {
+			this.script.aiScript.updatePageVar(this.value.name, this.v);
+			this.script.eval();
+		}
+	},
+
+	methods: {
+		click() {
+			this.v = this.v + (this.value.inc || 1);
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.llumlmnx
+	display inline-block
+	min-width 300px
+	max-width 450px
+	margin 8px 0
+</style>

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

@@ -0,0 +1,30 @@
+<template>
+<div v-show="script.vars[value.var]">
+	<x-block v-for="child in value.children" :value="child" :page="page" :script="script" :key="child.id" :h="h"/>
+</div>
+</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>

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.number-input.vue

@@ -0,0 +1,41 @@
+<template>
+<div>
+	<ui-input class="kudkigyw" v-model="v" type="number">{{ script.interpolate(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() {
+			this.script.aiScript.updatePageVar(this.value.name, this.v);
+			this.script.eval();
+		}
+	}
+});
+</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.post.vue

@@ -0,0 +1,68 @@
+<template>
+<div class="ngbfujlo">
+	<ui-textarea class="textarea" :value="text" readonly></ui-textarea>
+	<ui-button primary @click="post()" :disabled="posting || posted">{{ posted ? $t('posted-from-post-form') : $t('post-from-post-form') }}</ui-button>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../../i18n';
+
+export default Vue.extend({
+	i18n: i18n('pages'),
+
+	props: {
+		value: {
+			required: true
+		},
+		script: {
+			required: true
+		}
+	},
+
+	data() {
+		return {
+			text: this.script.interpolate(this.value.text),
+			posted: false,
+			posting: false,
+		};
+	},
+
+	created() {
+		this.$watch('script.vars', () => {
+			this.text = this.script.interpolate(this.value.text);
+		}, { deep: true });
+	},
+
+	methods: {
+		post() {
+			this.posting = true;
+			this.$root.api('notes/create', {
+				text: this.text,
+			}).then(() => {
+				this.posted = true;
+				this.$root.dialog({
+					type: 'success',
+					splash: true
+				});
+			});
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.ngbfujlo
+	padding 0 32px 32px 32px
+	border solid 2px var(--pageBlockBorder)
+	border-radius 6px
+
+	@media (max-width 600px)
+		padding 0 16px 16px 16px
+
+		> .textarea
+			margin-top 16px
+			margin-bottom 16px
+
+</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,43 @@
+<template>
+<div class="hkcxmtwj">
+	<ui-switch v-model="v">{{ script.interpolate(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.eval();
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.hkcxmtwj
+	display inline-block
+	margin 16px auto
+
+	& + .hkcxmtwj
+		margin-left 16px
+
+</style>

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

@@ -0,0 +1,41 @@
+<template>
+<div>
+	<ui-input class="kudkigyw" v-model="v" type="text">{{ script.interpolate(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() {
+			this.script.aiScript.updatePageVar(this.value.name, this.v);
+			this.script.eval();
+		}
+	}
+});
+</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.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.textarea-input.vue

@@ -0,0 +1,36 @@
+<template>
+<div>
+	<ui-textarea class="" v-model="v">{{ script.interpolate(value.text) }}</ui-textarea>
+</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.eval();
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+</style>

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

@@ -0,0 +1,33 @@
+<template>
+<ui-textarea class="" :value="text" readonly></ui-textarea>
+</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,164 @@
+<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>
+		<router-link :to="`./${page.name}/view-source`">{{ $t('view-source') }}</router-link>
+	</footer>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../../i18n';
+import { faICursor, faPlus } from '@fortawesome/free-solid-svg-icons';
+import { faSave, faStickyNote } from '@fortawesome/free-regular-svg-icons';
+import XBlock from './page.block.vue';
+import { ASEvaluator } from '../../../../../../misc/aiscript/evaluator';
+import { collectPageVars } from '../../../scripts/collect-page-vars';
+import { url } from '../../../../config';
+
+class Script {
+	public aiScript: ASEvaluator;
+	private onError: any;
+	public vars: Record<string, any>;
+
+	constructor(aiScript, onError) {
+		this.aiScript = aiScript;
+		this.onError = onError;
+		this.eval();
+	}
+
+	public eval() {
+		try {
+			this.vars = this.aiScript.evaluateVars();
+		} catch (e) {
+			this.onError(e);
+		}
+	}
+
+	public interpolate(str: string) {
+		if (str == null) return null;
+		return str.replace(/{(.+?)}/g, match => {
+			const v = this.vars[match.slice(1, -1).trim()];
+			return v == null ? 'NULL' : v.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
+		};
+	},
+
+	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 ASEvaluator(this.page.variables, pageVars, {
+				randomSeed: Math.random(),
+				user: page.user,
+				visitor: this.$store.state.i,
+				page: page,
+				url: url
+			}), e => {
+				console.dir(e);
+			});
+		});
+	},
+
+	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
+
+		> a
+			font-size 14px
+
+		> a + a
+			margin-left 8px
+
+</style>

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

@@ -18,7 +18,7 @@
 			<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">
-				<mfm v-if="announcements.length != 0" :text="announcements[i].text"/>
+				<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>

src/client/app/desktop/script.ts

@@ -156,7 +156,12 @@ 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: '/@:user/pages/:pageName/view-source', props: true, component: () => import('./views/pages/page-editor.vue').then(m => m.default) },
+			{ path: '/i/pages/new', component: () => import('./views/pages/page-editor.vue').then(m => m.default) },
+			{ path: '/i/pages/edit/:pageId', 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.vue

@@ -750,12 +750,17 @@ export default Vue.extend({
 				bottom 0
 				animation-delay -1.0s
 
-			@keyframes sk-rotate { 100% { transform: rotate(360deg); }}
+			@keyframes sk-rotate {
+				100% {
+					transform: rotate(360deg);
+				}
+			}
 
 			@keyframes sk-bounce {
 				0%, 100% {
 					transform: scale(0.0);
-				} 50% {
+				}
+				50% {
 					transform: scale(1.0);
 				}
 			}

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,7 +122,7 @@ export default Vue.extend({
 			});
 		},
 
-		fetchMore() {
+		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 => {
@@ -181,7 +181,7 @@ export default Vue.extend({
 				this.releaseQueue();
 			}
 
-			if (this.$store.state.settings.fetchOnScroll !== false) {
+			if (this.$store.state.settings.fetchOnScroll) {
 				const current = window.scrollY + window.innerHeight;
 				if (current > document.body.offsetHeight - 8) this.fetchMore();
 			}

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(() => {
@@ -377,7 +377,7 @@ export default Vue.extend({
 			}, err => {
 				this.$root.dialog({
 					type: 'error',
-					title: this.$t('error')
+					title: this.$t('error'),
 					text: err.message
 				});
 			}, {

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>
+					<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>
@@ -95,14 +102,14 @@ import MkFollowRequestsWindow from './received-follow-requests-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: {

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

@@ -480,7 +480,7 @@ export default Vue.extend({
 		&:focus
 			&:not([data-is-modal])
 				> .body
-						box-shadow 0 0 0px 1px var(--primaryAlpha05), 0 2px 12px 0 var(--desktopWindowShadow)
+						box-shadow 0 0 0 1px var(--primaryAlpha05), 0 2px 12px 0 var(--desktopWindowShadow)
 
 		> .handle
 			$size = 8px

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();

src/client/app/desktop/views/pages/page-editor.vue

@@ -0,0 +1,67 @@
+<template>
+<mk-ui>
+	<main>
+		<x-page-editor v-if="page !== undefined" :page="page" :readonly="readonly"/>
+	</main>
+</mk-ui>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	components: {
+		XPageEditor: () => import('../../../common/views/components/page-editor/page-editor.vue').then(m => m.default)
+	},
+
+	props: {
+		pageId: {
+			type: String,
+			required: false
+		},
+		pageName: {
+			type: String,
+			required: false
+		},
+		user: {
+			type: String,
+			required: false
+		}
+	},
+
+	data() {
+		return {
+			page: undefined,
+			readonly: false
+		};
+	},
+
+	created() {
+		if (this.pageId) {
+			this.$root.api('pages/show', {
+				pageId: this.pageId,
+			}).then(page => {
+				this.page = page;
+			});
+		} else if (this.pageName && this.user) {
+			this.$root.api('pages/show', {
+				name: this.pageName,
+				username: this.user,
+			}).then(page => {
+				this.readonly = true;
+				this.page = page;
+			});
+		} else {
+			this.page = null;
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+main
+	margin 0 auto
+	padding 16px
+	max-width 900px
+
+</style>

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

@@ -0,0 +1,36 @@
+<template>
+<mk-ui>
+	<main>
+		<x-page :page-name="page" :username="user"/>
+	</main>
+</mk-ui>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	components: {
+		XPage: () => import('../../../common/views/pages/page/page.vue').then(m => m.default)
+	},
+
+	props: {
+		page: {
+			type: String,
+			required: true
+		},
+		user: {
+			type: String,
+			required: true
+		},
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+main
+	margin 0 auto
+	padding 16px
+	max-width 950px
+
+</style>

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

@@ -352,7 +352,7 @@ export default Vue.extend({
 				padding 0 16px
 				line-height 48px
 				background var(--faceHeader)
-				box-shadow 0 1px 0px rgba(0, 0, 0, 0.1)
+				box-shadow 0 1px 0 rgba(0, 0, 0, 0.1)
 
 				& + div
 					max-height calc(100% - 48px)

src/client/app/mios.ts

@@ -173,9 +173,10 @@ export default class MiOS extends EventEmitter {
 
 			// Init service worker
 			if (this.shouldRegisterSw) {
-				this.getMeta().then(data => {
-					this.registerSw(data.swPublickey);
-				});
+				// #4813
+				//this.getMeta().then(data => {
+				//	this.registerSw(data.swPublickey);
+				//});
 			}
 		};
 
@@ -195,7 +196,7 @@ export default class MiOS extends EventEmitter {
 			});
 		} else {
 			// Get token from cookie or localStorage
-			const i = (document.cookie.match(/i=(!\w+)/) || [null, null])[1] || localStorage.getItem('i');
+			const i = (document.cookie.match(/i=(\w+)/) || [null, null])[1] || localStorage.getItem('i');
 
 			fetchme(i, me => {
 				if (me) {
@@ -504,7 +505,7 @@ class WindowSystem extends EventEmitter {
 function urlBase64ToUint8Array(base64String: string): Uint8Array {
 	const padding = '='.repeat((4 - base64String.length % 4) % 4);
 	const base64 = (base64String + padding)
-		.replace(/\-/g, '+')
+		.replace(/-/g, '+')
 		.replace(/_/g, '/');
 
 	const rawData = window.atob(base64);

src/client/app/mobile/script.ts

@@ -135,6 +135,7 @@ init((launch, os) => {
 			{ path: '/signup', name: 'signup', component: MkSignup },
 			{ path: '/i/settings', name: 'settings', component: () => import('./views/pages/settings.vue').then(m => m.default) },
 			{ path: '/i/favorites', name: 'favorites', component: MkFavorites },
+			{ path: '/i/pages', name: 'pages', component: () => import('./views/pages/pages.vue').then(m => m.default) },
 			{ path: '/i/lists', name: 'user-lists', component: MkUserLists },
 			{ path: '/i/lists/:list', name: 'user-list', component: MkUserList },
 			{ path: '/i/received-follow-requests', name: 'received-follow-requests', component: MkReceivedFollowRequests },
@@ -144,6 +145,8 @@ init((launch, os) => {
 			{ path: '/i/drive', name: 'drive', component: MkDrive },
 			{ path: '/i/drive/folder/:folder', component: MkDrive },
 			{ path: '/i/drive/file/:file', component: MkDrive },
+			{ path: '/i/pages/new', component: () => import('./views/pages/page-editor.vue').then(m => m.default) },
+			{ path: '/i/pages/edit/:pageId', props: true, component: () => import('./views/pages/page-editor.vue').then(m => m.default) },
 			{ path: '/selectdrive', component: MkSelectDrive },
 			{ path: '/search', component: MkSearch },
 			{ path: '/tags/:tag', component: MkTag },
@@ -156,6 +159,8 @@ init((launch, os) => {
 				{ path: 'following', component: () => import('../common/views/pages/following.vue').then(m => m.default) },
 				{ path: 'followers', component: () => import('../common/views/pages/followers.vue').then(m => m.default) },
 			]},
+			{ path: '/@:user/pages/:page', props: true, component: () => import('./views/pages/page.vue').then(m => m.default) },
+			{ path: '/@:user/pages/:pageName/view-source', props: true, component: () => import('./views/pages/page-editor.vue').then(m => m.default) },
 			{ path: '/notes/:note', component: MkNote },
 			{ path: '/authorize-follow', component: MkFollow },
 			{ path: '*', component: MkNotFound }

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

@@ -83,7 +83,7 @@ export default Vue.extend({
 			hierarchyFolders: [],
 			selectedFiles: [],
 			info: null,
-			connection: null
+			connection: null,
 
 			fetching: true,
 			fetchingMoreFiles: false,
@@ -385,7 +385,7 @@ export default Vue.extend({
 
 		createFolder() {
 			this.$root.dialog({
-				title: this.$t('folder-name')
+				title: this.$t('folder-name'),
 				input: {
 					default: this.folder.name
 				}
@@ -415,7 +415,7 @@ export default Vue.extend({
 				return;
 			}
 			this.$root.dialog({
-				title: this.$t('folder-name')
+				title: this.$t('folder-name'),
 				input: {
 					default: this.folder.name
 				}
@@ -597,12 +597,17 @@ export default Vue.extend({
 			bottom 0
 			animation-delay -1.0s
 
-		@keyframes sk-rotate { 100% { transform: rotate(360deg); }}
+		@keyframes sk-rotate {
+			100% {
+				transform: rotate(360deg);
+			}
+		}
 
 		@keyframes sk-bounce {
 			0%, 100% {
 				transform: scale(0.0);
-			} 50% {
+			}
+			50% {
 				transform: scale(1.0);
 			}
 		}

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

@@ -106,9 +106,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 {
@@ -123,10 +123,10 @@ export default Vue.extend({
 			});
 		},
 
-		fetchMore() {
+		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 => {
+			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;
@@ -175,7 +175,7 @@ export default Vue.extend({
 				this.releaseQueue();
 			}
 
-			if (this.$store.state.settings.fetchOnScroll !== false) {
+			if (this.$store.state.settings.fetchOnScroll) {
 				// 親要素が display none だったら弾く
 				// https://github.com/syuilo/misskey/issues/1569
 				// http://d.hatena.ne.jp/favril/20091105/1257403319

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

@@ -115,7 +115,7 @@ export default Vue.extend({
 		},
 
 		onScroll() {
-			if (this.$store.state.settings.fetchOnScroll !== false) {
+			if (this.$store.state.settings.fetchOnScroll) {
 				// 親要素が display none だったら弾く
 				// https://github.com/syuilo/misskey/issues/1569
 				// http://d.hatena.ne.jp/favril/20091105/1257403319

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

@@ -295,7 +295,7 @@ export default Vue.extend({
 			}, err => {
 				this.$root.dialog({
 					type: 'error',
-					title: this.$t('error')
+					title: this.$t('error'),
 					text: err.message
 				});
 			}, {
@@ -341,7 +341,7 @@ export default Vue.extend({
 
 		post() {
 			this.posting = true;
-			const viaMobile = this.$store.state.settings.disableViaMobile !== true;
+			const viaMobile = !this.$store.state.settings.disableViaMobile;
 			this.$root.api('notes/create', {
 				text: this.text == '' ? undefined : this.text,
 				fileIds: this.files.length > 0 ? this.files.map(f => f.id) : undefined,

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

@@ -49,7 +49,7 @@ export default Vue.extend({
 	padding 0 8px
 
 	&.shadow
-		box-shadow 0 0px 8px rgba(0, 0, 0, 0.25)
+		box-shadow 0 0 8px rgba(0, 0, 0, 0.25)
 
 	&, *
 		user-select none

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

@@ -29,6 +29,7 @@
 						<li><router-link to="/i/favorites" :data-active="$route.name == 'favorites'"><i><fa icon="star" fixed-width/></i>{{ $t('@.favorites') }}<i><fa icon="angle-right"/></i></router-link></li>
 						<li><router-link to="/i/lists" :data-active="$route.name == 'user-lists'"><i><fa icon="list" fixed-width/></i>{{ $t('user-lists') }}<i><fa icon="angle-right"/></i></router-link></li>
 						<li><router-link to="/i/drive" :data-active="$route.name == 'drive'"><i><fa icon="cloud" fixed-width/></i>{{ $t('@.drive') }}<i><fa icon="angle-right"/></i></router-link></li>
+						<li><router-link to="/i/pages" :data-active="$route.name == 'pages'"><i><fa :icon="faStickyNote" fixed-width/></i>{{ $t('@.pages') }}<i><fa icon="angle-right"/></i></router-link></li>
 					</ul>
 					<ul>
 						<li><a @click="search"><i><fa icon="search" fixed-width/></i>{{ $t('search') }}<i><fa icon="angle-right"/></i></a></li>
@@ -43,7 +44,7 @@
 				<div class="announcements" v-if="announcements && announcements.length > 0">
 					<article v-for="announcement in announcements">
 						<span v-html="announcement.title" class="title"></span>
-						<mfm :text="announcement.text"/>
+						<div><mfm :text="announcement.text"/></div>
 						<img v-if="announcement.image" :src="announcement.image" alt="" style="display: block; max-height: 120px; max-width: 100%;"/>
 					</article>
 				</div>
@@ -66,7 +67,7 @@ import Vue from 'vue';
 import i18n from '../../../i18n';
 import { lang } from '../../../config';
 import { faNewspaper, faHashtag, faHome, faColumns } from '@fortawesome/free-solid-svg-icons';
-import { faMoon, faSun } from '@fortawesome/free-regular-svg-icons';
+import { faMoon, faSun, faStickyNote } from '@fortawesome/free-regular-svg-icons';
 import { search } from '../../../common/scripts/search';
 
 export default Vue.extend({
@@ -86,7 +87,7 @@ export default Vue.extend({
 			announcements: [],
 			searching: false,
 			showNotifications: false,
-			faNewspaper, faHashtag, faMoon, faSun, faHome, faColumns
+			faNewspaper, faHashtag, faMoon, faSun, faHome, faColumns, faStickyNote
 		};
 	},
 

src/client/app/mobile/views/pages/page-editor.vue

@@ -0,0 +1,67 @@
+<template>
+<mk-ui>
+	<main>
+		<x-page-editor v-if="page !== undefined" :page="page" :readonly="readonly"/>
+	</main>
+</mk-ui>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	components: {
+		XPageEditor: () => import('../../../common/views/components/page-editor/page-editor.vue').then(m => m.default)
+	},
+
+	props: {
+		pageId: {
+			type: String,
+			required: false
+		},
+		pageName: {
+			type: String,
+			required: false
+		},
+		user: {
+			type: String,
+			required: false
+		}
+	},
+
+	data() {
+		return {
+			page: undefined,
+			readonly: false
+		};
+	},
+
+	created() {
+		if (this.pageId) {
+			this.$root.api('pages/show', {
+				pageId: this.pageId,
+			}).then(page => {
+				this.page = page;
+			});
+		} else if (this.pageName && this.user) {
+			this.$root.api('pages/show', {
+				name: this.pageName,
+				username: this.user,
+			}).then(page => {
+				this.readonly = true;
+				this.page = page;
+			});
+		} else {
+			this.page = null;
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+main
+	margin 0 auto
+	padding 16px
+	max-width 1000px
+
+</style>

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

@@ -0,0 +1,39 @@
+<template>
+<mk-ui>
+	<main>
+		<x-page :page-name="page" :username="user"/>
+	</main>
+</mk-ui>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	components: {
+		XPage: () => import('../../../common/views/pages/page/page.vue').then(m => m.default)
+	},
+
+	props: {
+		page: {
+			type: String,
+			required: true
+		},
+		user: {
+			type: String,
+			required: true
+		},
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+main
+	margin 0 auto
+	padding 16px
+	max-width 1000px
+
+	@media (min-width 600px)
+		padding 32px
+
+</style>

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

@@ -0,0 +1,94 @@
+<template>
+<mk-ui>
+	<template #header><span style="margin-right:4px;"><fa :icon="faStickyNote"/></span>{{ $t('@.pages') }}</template>
+
+	<main>
+		<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>
+	</main>
+</mk-ui>
+</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>
+main
+	> * > .page
+		margin-bottom 8px
+
+	@media (min-width 500px)
+		> * > .page
+			margin-bottom 16px
+
+</style>

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

@@ -12,6 +12,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;
 
@@ -19,10 +20,10 @@ export default Vue.extend({
 	i18n: i18n('mobile/views/pages/search.vue'),
 	data() {
 		return {
-			makePromise: cursor => this.$root.api('notes/search', {
+			makePromise: async cursor => this.$root.api('notes/search', {
 				limit: limit + 1,
 				untilId: cursor ? cursor : undefined,
-				query: this.q
+				...(await genSearchQuery(this, this.q))
 			}).then(notes => {
 				if (notes.length == limit + 1) {
 					notes.pop();

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

@@ -18,7 +18,7 @@
 				</div>
 				<div class="title">
 					<h1><mk-user-name :user="user" :key="user.id"/></h1>
-					<span class="username"><mk-acct :user="user" :detail="true" /></span>
+					<span class="username"><mk-acct :user="user" :detail="true" :key="user.id"/></span>
 					<span class="followed" v-if="user.isFollowed">{{ $t('follows-you') }}</span>
 				</div>
 				<div class="description">

src/client/app/reset.styl

@@ -1,5 +1,5 @@
 input
-	min-width 0px
+	min-width 0
 
 input:not([type])
 input[type='text']

src/client/app/store.ts

@@ -126,7 +126,7 @@ export default (os: MiOS) => new Vuex.Store({
 
 		logout(ctx) {
 			ctx.commit('updateI', null);
-			document.cookie = 'i=;';
+			document.cookie = `i=; max-age=0; domain=${document.location.hostname}`;
 			localStorage.removeItem('i');
 		},
 

src/client/app/sw.js

@@ -3,12 +3,6 @@
  */
 
 import composeNotification from './common/scripts/compose-notification';
-import { erase } from '../../prelude/array';
-
-// キャッシュするリソース
-const cachee = [
-	'/'
-];
 
 // インストールされたとき
 self.addEventListener('install', ev => {
@@ -16,31 +10,9 @@ self.addEventListener('install', ev => {
 
 	ev.waitUntil(Promise.all([
 		self.skipWaiting(), // Force activate
-		caches.open(_VERSION_).then(cache => cache.addAll(cachee)) // Cache
 	]));
 });
 
-// アクティベートされたとき
-self.addEventListener('activate', ev => {
-	// Clean up old caches
-	ev.waitUntil(
-		caches.keys().then(keys => Promise.all(
-			erase(_VERSION_, keys)
-				.map(key => caches.delete(key))
-		))
-	);
-});
-
-// リクエストが発生したとき
-self.addEventListener('fetch', ev => {
-	ev.respondWith(
-		// キャッシュがあるか確認してあればそれを返す
-		caches.match(ev.request).then(response =>
-			response || fetch(ev.request)
-		)
-	);
-});
-
 // プッシュ通知を受け取ったとき
 self.addEventListener('push', ev => {
 	// クライアント取得
@@ -59,11 +31,3 @@ self.addEventListener('push', ev => {
 		});
 	}));
 });
-
-self.addEventListener('message', ev => {
-	if (ev.data == 'clear') {
-		caches.keys().then(keys => {
-			for (const key of keys) caches.delete(key);
-		});
-	}
-});

src/client/themes/dark.json5

@@ -232,5 +232,8 @@
 		adminDashboardCardBg: '$secondary',
 		adminDashboardCardFg: '$text',
 		adminDashboardCardDivider: 'rgba(0, 0, 0, 0.3)',
+
+		pageBlockBorder: 'rgba(255, 255, 255, 0.1)',
+		pageBlockBorderHover: 'rgba(255, 255, 255, 0.15)',
 	},
 }

src/client/themes/light.json5

@@ -232,5 +232,8 @@
 		adminDashboardCardBg: '$secondary',
 		adminDashboardCardFg: '$text',
 		adminDashboardCardDivider: 'rgba(0, 0, 0, 0.082)',
+
+		pageBlockBorder: 'rgba(0, 0, 0, 0.1)',
+		pageBlockBorderHover: 'rgba(0, 0, 0, 0.15)',
 	},
 }

src/db/elasticsearch.ts

@@ -1,41 +1,30 @@
-import * as elasticsearch from 'elasticsearch';
+import * as elasticsearch from '@elastic/elasticsearch';
 import config from '../config';
-import Logger from '../services/logger';
-
-const esLogger = new Logger('es');
 
 const index = {
 	settings: {
 		analysis: {
-			normalizer: {
-				lowercase_normalizer: {
-					type: 'custom',
-					filter: ['lowercase']
-				}
-			},
 			analyzer: {
-				bigram: {
-					tokenizer: 'bigram_tokenizer'
-				}
-			},
-			tokenizer: {
-				bigram_tokenizer: {
-					type: 'nGram',
-					min_gram: 2,
-					max_gram: 2
+				ngram: {
+					tokenizer: 'ngram'
 				}
 			}
 		}
 	},
 	mappings: {
-		note: {
-			properties: {
-				text: {
-					type: 'text',
-					index: true,
-					analyzer: 'bigram',
-					normalizer: 'lowercase_normalizer'
-				}
+		properties: {
+			text: {
+				type: 'text',
+				index: true,
+				analyzer: 'ngram',
+			},
+			userId: {
+				type: 'keyword',
+				index: true,
+			},
+			userHost: {
+				type: 'keyword',
+				index: true,
 			}
 		}
 	}
@@ -43,31 +32,20 @@ const index = {
 
 // Init ElasticSearch connection
 const client = config.elasticsearch ? new elasticsearch.Client({
-	host: `${config.elasticsearch.host}:${config.elasticsearch.port}`
+	node: `http://${config.elasticsearch.host}:${config.elasticsearch.port}`,
+	pingTimeout: 30000
 }) : null;
 
 if (client) {
-	// Send a HEAD request
-	client.ping({
-		// Ping usually has a 3000ms timeout
-		requestTimeout: 30000
-	}, error => {
-		if (error) {
-			esLogger.error('elasticsearch is down!');
-		} else {
-			esLogger.succ('elasticsearch is available!');
-		}
-	});
-
 	client.indices.exists({
-		index: 'misskey'
+		index: 'misskey_note'
 	}).then(exist => {
-		if (exist) return;
-
-		client.indices.create({
-			index: 'misskey',
-			body: index
-		});
+		if (!exist.body) {
+			client.indices.create({
+				index: 'misskey_note',
+				body: index
+			});
+		}
 	});
 }
 

src/db/postgre.ts

@@ -40,6 +40,7 @@ import { Poll } from '../models/entities/poll';
 import { UserKeypair } from '../models/entities/user-keypair';
 import { UserPublickey } from '../models/entities/user-publickey';
 import { UserProfile } from '../models/entities/user-profile';
+import { Page } from '../models/entities/page';
 
 const sqlLogger = dbLogger.createSubLogger('sql', 'white', false);
 
@@ -114,6 +115,7 @@ export function initDb(justBorrow = false, sync = false, log = false) {
 			NoteReaction,
 			NoteWatching,
 			NoteUnread,
+			Page,
 			Log,
 			DriveFile,
 			DriveFolder,

src/mfm/language.ts

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

src/mfm/prelude.ts

@@ -36,4 +36,4 @@ export function createTree(type: string, children: MfmForest, props: any): MfmTr
 	return T.createTree({ type, props }, children);
 }
 
-export const urlRegex = /^https?:\/\/[\w\/:%#@\$&\?!\(\)\[\]~\.,=\+\-]+/;
+export const urlRegex = /^https?:\/\/[\w\/:%#@$&?!()\[\]~.,=+\-]+/;