Merge branch 'develop'

11.11.0
MisskeyPagesにリストから選択関数を追加
2019-05-05 20:33:44 +09:00 · 2019-05-05 20:33:29 +09:00 · 2019-05-05 20:31:15 +09:00 · 2019-05-05 20:16:05 +09:00 · 2019-05-05 20:12:35 +09:00 · 2019-05-05 15:17:29 +09:00
64 changed files with 316 additions and 192 deletions
--- a/.node-version
+++ b/.node-version
@ -1 +1 @@
-v11.7.0
+v12.1.0
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,6 +5,37 @@ 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
 ------------------------------
 ### 移行の注意点
@ -42,6 +73,43 @@ 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
@ -104,36 +172,7 @@ mongodb:
 11.5.0 (2019/04/29)
 -------------------
 ### 注意
-このアップデートを適用した後、プロセスを起動(もしくは再起動)する前にまず以下の手順を実行してください
-
-#### 1
-`ormconfig.json`という名前で、Misskeyのインストール場所(package.jsonとかがあるディレクトリ)に新たなファイルを作る。中身は次のようにします:
-``` json
-{
-	"type": "postgres",
-	"host": "PostgreSQLのホスト",
-	"port": 5432,
-	"username": "PostgreSQLのユーザー名",
-	"password": "PostgreSQLのパスワード",
-	"database": "PostgreSQLのデータベース名",
-	"entities": ["src/models/entities/*.ts"],
-	"migrations": ["migration/*.ts"],
-	"cli": {
-		"migrationsDir": "migration"
-	}
-}
-```
-上記の各種PostgreSQLの設定(ポートも)は、設定ファイルに書いてあるものをコピーしてください。
-
-#### 2
-```
-npm i -g ts-node
-```
-
-#### 3
-```
-ts-node ./node_modules/typeorm/cli.js migration:run
-```
+このアップデートを適用した後、プロセスを起動(もしくは再起動)する前に[マイグレーション](migration)の手順を実行してください

 ### New features
 #### MisskeyPages
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-FROM node:11-alpine AS base
+FROM node:12.1-alpine AS base

 ENV NODE_ENV=production

--- a/README.md
+++ b/README.md
@ -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
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@ -1865,8 +1865,8 @@ pages:
  font: "フォント"
  fontSerif: "セリフ"
  fontSansSerif: "サンセリフ"
-  set-eye-catchig-image: "アイキャッチ画像を設定"
-  remove-eye-catchig-image: "アイキャッチ画像を削除"
+  set-eye-catching-image: "アイキャッチ画像を設定"
+  remove-eye-catching-image: "アイキャッチ画像を削除"
  choose-block: "ブロックを追加"
  select-type: "種類を選択"
  enter-variable-name: "変数名を決めてください"
@ -1941,6 +1941,7 @@ pages:
      fn: "関数"
      text: "テキスト操作"
      convert: "変換"
+      list: "リスト"
    blocks:
      text: "テキスト"
      multiLineText: "テキスト(複数行)"
@ -1982,6 +1983,10 @@ pages:
      _divide:
        arg1: "A"
        arg2: "B"
+      remind: "÷ 割った余り"
+      _remind:
+        arg1: "A"
+        arg2: "B"
      eq: "AとBが同じ"
      _eq:
        arg1: "A"
@ -2055,6 +2060,13 @@ pages:
      _seedRandomPick:
        arg1: "シード"
        arg2: "リスト"
+      DRPWPM: "確率付きリストからランダムに選択 (ユーザーごとに日替わり)"
+      _DRPWPM:
+        arg1: "テキストのリスト"
+      pick: "リストから選択"
+      _pick:
+        arg1: "リスト"
+        arg2: "位置"
      number: "数値"
      stringToNumber: "テキストを数値に"
      _stringToNumber:
--- a/migration/1556746559567-UserProfile.ts
+++ b/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`);
+    }
+
+}
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.9.0",
+	"version": "11.11.0",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",
@ -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,7 +77,7 @@
 		"@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",
@ -89,7 +89,7 @@
 		"@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",
@ -112,12 +112,12 @@
 		"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",
 		"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",
@ -160,13 +160,13 @@
 		"loader-utils": "1.2.3",
 		"lolex": "3.1.0",
 		"lookup-dns-cache": "2.1.0",
-		"minio": "7.0.7",
-		"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",
@ -234,8 +234,8 @@
 		"vue-color": "2.7.0",
 		"vue-content-loading": "1.6.0",
 		"vue-cropperjs": "3.0.0",
-		"vue-i18n": "8.11.1",
-		"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",
@ -251,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"
 	}
 }
--- a/src/client/app/app.styl
+++ b/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)
--- a/src/client/app/auth/views/index.vue
+++ b/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
--- a/src/client/app/common/hotkey.ts
+++ b/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
 	);
 }

--- a/src/client/app/common/scripts/should-mute-note.ts
+++ b/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))
 	);
 }
--- a/src/client/app/common/views/components/analog-clock.vue
+++ b/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();
 		},
--- a/src/client/app/common/views/components/messaging.vue
+++ b/src/client/app/common/views/components/messaging.vue
@ -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)
--- a/src/client/app/common/views/components/page-editor/page-editor.blocks.vue
+++ b/src/client/app/common/views/components/page-editor/page-editor.blocks.vue
@ -1,6 +1,6 @@
 <template>
-<x-draggable tag="div" :list="blocks" handle=".drag-handle" :group="{ name: 'blocks' }" animation="150">
-	<component v-for="block in blocks" :is="'x-' + block.type" :value="block" @input="updateItem" @remove="removeItem" :key="block.id" :ai-script="aiScript"/>
+<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>

@ -14,7 +14,7 @@ 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.text-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';
--- a/src/client/app/common/views/components/page-editor/page-editor.container.vue
+++ b/src/client/app/common/views/components/page-editor/page-editor.container.vue
@ -1,12 +1,15 @@
 <template>
-<div class="cpjygsrt" :class="{ error: error != null, warn: warn != null, draggable }">
-	<header class="drag-handle">
+<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>
@ -23,6 +26,7 @@

 <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';

@ -54,7 +58,7 @@ export default Vue.extend({
 	data() {
 		return {
 			showBody: this.expanded,
-			faTrashAlt
+			faTrashAlt, faBars
 		};
 	},
 	methods: {
@ -124,9 +128,8 @@ export default Vue.extend({
 				&:active
 					color var(--faceTextButtonActive)

-	&.draggable
-		> header
-			cursor move
+			.drag-handle
+				cursor move

 	> .warn
 		color #b19e49
--- a/src/client/app/common/views/components/page-editor/page-editor.vue
+++ b/src/client/app/common/views/components/page-editor/page-editor.vue
@ -36,10 +36,10 @@
 				</ui-select>

 				<div class="eyeCatch">
-					<ui-button v-if="eyeCatchingImageId == null && !readonly" @click="setEyeCatchingImage()"><fa :icon="faPlus"/> {{ $t('set-eye-catchig-image') }}</ui-button>
+					<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-catchig-image') }}</ui-button>
+						<ui-button @click="removeEyeCatchingImage()" v-if="!readonly"><fa :icon="faTrashAlt"/> {{ $t('remove-eye-catching-image') }}</ui-button>
 					</div>
 				</div>
 			</template>
@ -337,7 +337,7 @@ export default Vue.extend({
 		getScriptBlockList(type: string = null) {
 			const list = [];

-			const blocks = blockDefs.filter(block => type === null || block.out === null || block.out === type);
+			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);
--- a/src/client/app/common/views/components/settings/integration.vue
+++ b/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();
--- a/src/client/app/common/views/components/settings/profile.vue
+++ b/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() {
--- a/src/client/app/common/views/components/settings/theme.vue
+++ b/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], {
--- a/src/client/app/common/views/components/signin.vue
+++ b/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>

--- a/src/client/app/common/views/components/ui/input.vue
+++ b/src/client/app/common/views/components/ui/input.vue
@ -322,7 +322,7 @@ root(fill)

 			> .value
 				display block
-				width 0%
+				width 0
 				height 100%
 				background transparent
 				border-radius 6px
--- a/src/client/app/common/views/components/user-list.vue
+++ b/src/client/app/common/views/components/user-list.vue
@ -166,7 +166,7 @@ export default Vue.extend({
 			> .follow-button
 				position absolute
 				top 8px
-				right 0px
+				right 0

 	> .more
 		display block
--- a/src/client/app/common/views/deck/deck.column.vue
+++ b/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');
 			}
--- a/src/client/app/common/views/deck/deck.user-column.vue
+++ b/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
--- a/src/client/app/common/views/directives/autocomplete.ts
+++ b/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);
--- a/src/client/app/common/views/pages/page/page.vue
+++ b/src/client/app/common/views/pages/page/page.vue
@ -47,7 +47,7 @@ class Script {

 	public interpolate(str: string) {
 		if (str == null) return null;
-		return str.replace(/\{(.+?)\}/g, match => {
+		return str.replace(/{(.+?)}/g, match => {
 			const v = this.vars[match.slice(1, -1).trim()];
 			return v == null ? 'NULL' : v.toString();
 		});
--- a/src/client/app/desktop/views/components/drive.vue
+++ b/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);
 				}
 			}
--- a/src/client/app/desktop/views/components/notes.vue
+++ b/src/client/app/desktop/views/components/notes.vue
@ -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();
 			}
--- a/src/client/app/desktop/views/components/post-form.vue
+++ b/src/client/app/desktop/views/components/post-form.vue
@ -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
 				});
 			}, {
--- a/src/client/app/desktop/views/components/window.vue
+++ b/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
--- a/src/client/app/desktop/views/pages/welcome.vue
+++ b/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)
--- a/src/client/app/mios.ts
+++ b/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);
+				//});
 			}
 		};

@ -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);
--- a/src/client/app/mobile/views/components/drive.vue
+++ b/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);
 			}
 		}
--- a/src/client/app/mobile/views/components/notes.vue
+++ b/src/client/app/mobile/views/components/notes.vue
@ -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
--- a/src/client/app/mobile/views/components/notifications.vue
+++ b/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
--- a/src/client/app/mobile/views/components/post-form.vue
+++ b/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,
--- a/src/client/app/mobile/views/components/ui.header.vue
+++ b/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
--- a/src/client/app/reset.styl
+++ b/src/client/app/reset.styl
@ -1,5 +1,5 @@
 input
-	min-width 0px
+	min-width 0

 input:not([type])
 input[type='text']
--- a/src/client/app/store.ts
+++ b/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');
 		},

--- a/src/client/app/sw.js
+++ b/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);
-		});
-	}
-});
--- a/src/mfm/language.ts
+++ b/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);
--- a/src/mfm/prelude.ts
+++ b/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\/:%#@$&?!()\[\]~.,=+\-]+/;
--- a/src/misc/aiscript/evaluator.ts
+++ b/src/misc/aiscript/evaluator.ts
@ -64,7 +64,7 @@ export class ASEvaluator {

 	@autobind
 	private interpolate(str: string, scope: Scope) {
-		return str.replace(/\{(.+?)\}/g, match => {
+		return str.replace(/{(.+?)}/g, match => {
 			const v = scope.getState(match.slice(1, -1).trim());
 			return v == null ? 'NULL' : v.toString();
 		});
@ -160,6 +160,7 @@ export class ASEvaluator {
 			subtract: (a: number, b: number) => a - b,
 			multiply: (a: number, b: number) => a * b,
 			divide: (a: number, b: number) => a / b,
+			remind: (a: number, b: number) => a % b,
 			strLen: (a: string) => a.length,
 			strPick: (a: string, b: number) => a[b - 1],
 			strReplace: (a: string, b: string, c: string) => a.split(b).join(c),
@ -168,6 +169,7 @@ export class ASEvaluator {
 			stringToNumber: (a: string) => parseInt(a),
 			numberToString: (a: number) => a.toString(),
 			splitStrByLine: (a: string) => a.split('\n'),
+			pick: (list: any[], i: number) => list[i - 1],
 			random: (probability: number) => Math.floor(seedrandom(`${this.opts.randomSeed}:${block.id}`)() * 100) < probability,
 			rannum: (min: number, max: number) => min + Math.floor(seedrandom(`${this.opts.randomSeed}:${block.id}`)() * (max - min + 1)),
 			randomPick: (list: any[]) => list[Math.floor(seedrandom(`${this.opts.randomSeed}:${block.id}`)() * list.length)],
@ -177,6 +179,27 @@ export class ASEvaluator {
 			seedRandom: (seed: any, probability: number) => Math.floor(seedrandom(seed)() * 100) < probability,
 			seedRannum: (seed: any, min: number, max: number) => min + Math.floor(seedrandom(seed)() * (max - min + 1)),
 			seedRandomPick: (seed: any, list: any[]) => list[Math.floor(seedrandom(seed)() * list.length)],
+			DRPWPM: (list: string[]) => {
+				const xs = [];
+				let totalFactor = 0;
+				for (const x of list) {
+					const parts = x.split(' ');
+					const factor = parseInt(parts.pop()!, 10);
+					const text = parts.join(' ');
+					totalFactor += factor;
+					xs.push({ factor, text });
+				}
+				const r = seedrandom(`${day}:${block.id}`)() * totalFactor;
+				let stackedFactor = 0;
+				for (const x of xs) {
+					if (r >= stackedFactor && r <= x.factor) {
+						return x.text;
+					} else {
+						stackedFactor += x.factor;
+					}
+				}
+				return xs[0].text;
+			},
 		};

 		const fnName = block.type;
--- a/src/misc/aiscript/index.ts
+++ b/src/misc/aiscript/index.ts
@ -23,6 +23,7 @@ import {
 	faSortNumericUp,
 	faExchangeAlt,
 	faRecycle,
+	faIndent,
 } from '@fortawesome/free-solid-svg-icons';
 import { faFlag } from '@fortawesome/free-regular-svg-icons';

@ -57,6 +58,7 @@ export const funcDefs: Record<string, { in: any[]; out: any; category: string; i
 	subtract:        { in: ['number', 'number'],           out: 'number',      category: 'operation',  icon: faMinus, },
 	multiply:        { in: ['number', 'number'],           out: 'number',      category: 'operation',  icon: faTimes, },
 	divide:          { in: ['number', 'number'],           out: 'number',      category: 'operation',  icon: faDivide, },
+	remind:          { in: ['number', 'number'],           out: 'number',      category: 'operation',  icon: faDivide, },
 	eq:              { in: [0, 0],                         out: 'boolean',     category: 'comparison', icon: faEquals, },
 	notEq:           { in: [0, 0],                         out: 'boolean',     category: 'comparison', icon: faNotEqual, },
 	gt:              { in: ['number', 'number'],           out: 'boolean',     category: 'comparison', icon: faGreaterThan, },
@ -71,6 +73,7 @@ export const funcDefs: Record<string, { in: any[]; out: any; category: string; i
 	stringToNumber:  { in: ['string'],                     out: 'number',      category: 'convert',    icon: faExchangeAlt, },
 	numberToString:  { in: ['number'],                     out: 'string',      category: 'convert',    icon: faExchangeAlt, },
 	splitStrByLine:  { in: ['string'],                     out: 'stringArray', category: 'convert',    icon: faExchangeAlt, },
+	pick:            { in: [null],                         out: null,          category: 'list',       icon: faIndent, },
 	rannum:          { in: ['number', 'number'],           out: 'number',      category: 'random',     icon: faDice, },
 	dailyRannum:     { in: ['number', 'number'],           out: 'number',      category: 'random',     icon: faDice, },
 	seedRannum:      { in: [null, 'number', 'number'],     out: 'number',      category: 'random',     icon: faDice, },
@ -80,6 +83,7 @@ export const funcDefs: Record<string, { in: any[]; out: any; category: string; i
 	randomPick:      { in: [0],                            out: 0,             category: 'random',     icon: faDice, },
 	dailyRandomPick: { in: [0],                            out: 0,             category: 'random',     icon: faDice, },
 	seedRandomPick:  { in: [null, 0],                      out: 0,             category: 'random',     icon: faDice, },
+	DRPWPM:      { in: ['stringArray'],                out: 'string',      category: 'random',     icon: faDice, }, // dailyRandomPickWithProbabilityMapping
 };

 export const literalDefs: Record<string, { out: any; category: string; icon: any; }> = {
--- a/src/misc/gen-id.ts
+++ b/src/misc/gen-id.ts
@ -1,6 +1,7 @@
 import { ulid } from 'ulid';
 import { genAid } from './id/aid';
 import { genMeid } from './id/meid';
+import { genMeidg } from './id/meidg';
 import { genObjectId } from './id/object-id';
 import config from '../config';

@ -12,6 +13,7 @@ export function genId(date?: Date): string {
 	switch (metohd) {
 		case 'aid': return genAid(date);
 		case 'meid': return genMeid(date);
+		case 'meidg': return genMeidg(date);
 		case 'ulid': return ulid(date.getTime());
 		case 'objectid': return genObjectId(date);
 		default: throw new Error('unknown id generation method');
--- a/src/misc/id/meidg.ts
+++ b/src/misc/id/meidg.ts
@ -0,0 +1,28 @@
+const CHARS = '0123456789abcdef';
+
+//  4bit Fixed hex value 'g'
+// 44bit UNIX Time ms in Hex
+// 48bit Random value in Hex
+
+function getTime(time: number) {
+	if (time < 0) time = 0;
+	if (time === 0) {
+		return CHARS[0];
+	}
+
+	return time.toString(16).padStart(11, CHARS[0]);
+}
+
+function getRandom() {
+	let str = '';
+
+	for (let i = 0; i < 12; i++) {
+		str += CHARS[Math.floor(Math.random() * CHARS.length)];
+	}
+
+	return str;
+}
+
+export function genMeidg(date: Date): string {
+	return 'g' + getTime(date.getTime()) + getRandom();
+}
--- a/src/models/entities/user-profile.ts
+++ b/src/models/entities/user-profile.ts
@ -26,7 +26,7 @@ export class UserProfile {
 	public birthday: string | null;

 	@Column('varchar', {
-		length: 1024, nullable: true,
+		length: 2048, nullable: true,
 		comment: 'The description (bio) of the User.'
 	})
 	public description: string | null;
@ -144,10 +144,10 @@ export class UserProfile {
 	})
 	public githubAccessToken: string | null;

-	@Column('integer', {
-		nullable: true, default: null,
+	@Column('varchar', {
+		length: 64, nullable: true, default: null,
 	})
-	public githubId: number | null;
+	public githubId: string | null;

 	@Column('varchar', {
 		length: 64, nullable: true, default: null,
@ -169,10 +169,10 @@ export class UserProfile {
 	})
 	public discordRefreshToken: string | null;

-	@Column('integer', {
-		nullable: true, default: null,
+	@Column('varchar', {
+		length: 64, nullable: true, default: null,
 	})
-	public discordExpiresDate: number | null;
+	public discordExpiresDate: string | null;

 	@Column('varchar', {
 		length: 64, nullable: true, default: null,
--- a/src/models/repositories/user.ts
+++ b/src/models/repositories/user.ts
@ -127,6 +127,20 @@ export class UserRepository extends Repository<User> {
 				pinnedNotes: Notes.packMany(pins.map(pin => pin.noteId), meId, {
 					detail: true
 				}),
+				twoFactorEnabled: profile!.twoFactorEnabled,
+				twitter: profile!.twitter ? {
+					id: profile!.twitterUserId,
+					screenName: profile!.twitterScreenName
+				} : null,
+				github: profile!.github ? {
+					id: profile!.githubId,
+					login: profile!.githubLogin
+				} : null,
+				discord: profile!.discord ? {
+					id: profile!.discordId,
+					username: profile!.discordUsername,
+					discriminator: profile!.discordDiscriminator
+				} : null,
 			} : {}),

 			...(opts.detail && meId === user.id ? {
@ -135,7 +149,6 @@ export class UserRepository extends Repository<User> {
 				autoWatch: profile!.autoWatch,
 				alwaysMarkNsfw: profile!.alwaysMarkNsfw,
 				carefulBot: profile!.carefulBot,
-				twoFactorEnabled: profile!.twoFactorEnabled,
 				hasUnreadMessagingMessage: MessagingMessages.count({
 					where: {
 						recipientId: user.id,
@ -217,7 +230,7 @@ export class UserRepository extends Repository<User> {
 	}

 	public isValidBirthday(birthday: string): boolean {
-		return typeof birthday == 'string' && /^([0-9]{4})\-([0-9]{2})-([0-9]{2})$/.test(birthday);
+		return typeof birthday == 'string' && /^([0-9]{4})-([0-9]{2})-([0-9]{2})$/.test(birthday);
 	}
 	//#endregion
 }
--- a/src/queue/processors/db/export-blocking.ts
+++ b/src/queue/processors/db/export-blocking.ts
@ -85,7 +85,7 @@ export async function exportBlocking(job: Bull.Job, done: any): Promise<void> {
 	logger.succ(`Exported to: ${path}`);

 	const fileName = 'blocking-' + dateFormat(new Date(), 'yyyy-mm-dd-HH-MM-ss') + '.csv';
-	const driveFile = await addFile(user, path, fileName);
+	const driveFile = await addFile(user, path, fileName, null, null, true);

 	logger.succ(`Exported to: ${driveFile.id}`);
 	cleanup();
--- a/src/queue/processors/db/export-following.ts
+++ b/src/queue/processors/db/export-following.ts
@ -85,7 +85,7 @@ export async function exportFollowing(job: Bull.Job, done: any): Promise<void> {
 	logger.succ(`Exported to: ${path}`);

 	const fileName = 'following-' + dateFormat(new Date(), 'yyyy-mm-dd-HH-MM-ss') + '.csv';
-	const driveFile = await addFile(user, path, fileName);
+	const driveFile = await addFile(user, path, fileName, null, null, true);

 	logger.succ(`Exported to: ${driveFile.id}`);
 	cleanup();
--- a/src/queue/processors/db/export-mute.ts
+++ b/src/queue/processors/db/export-mute.ts
@ -85,7 +85,7 @@ export async function exportMute(job: Bull.Job, done: any): Promise<void> {
 	logger.succ(`Exported to: ${path}`);

 	const fileName = 'mute-' + dateFormat(new Date(), 'yyyy-mm-dd-HH-MM-ss') + '.csv';
-	const driveFile = await addFile(user, path, fileName);
+	const driveFile = await addFile(user, path, fileName, null, null, true);

 	logger.succ(`Exported to: ${driveFile.id}`);
 	cleanup();
--- a/src/queue/processors/db/export-notes.ts
+++ b/src/queue/processors/db/export-notes.ts
@ -108,7 +108,7 @@ export async function exportNotes(job: Bull.Job, done: any): Promise<void> {
 	logger.succ(`Exported to: ${path}`);

 	const fileName = 'notes-' + dateFormat(new Date(), 'yyyy-mm-dd-HH-MM-ss') + '.json';
-	const driveFile = await addFile(user, path, fileName);
+	const driveFile = await addFile(user, path, fileName, null, null, true);

 	logger.succ(`Exported to: ${driveFile.id}`);
 	cleanup();
--- a/src/queue/processors/db/export-user-lists.ts
+++ b/src/queue/processors/db/export-user-lists.ts
@ -62,7 +62,7 @@ export async function exportUserLists(job: Bull.Job, done: any): Promise<void> {
 	logger.succ(`Exported to: ${path}`);

 	const fileName = 'user-lists-' + dateFormat(new Date(), 'yyyy-mm-dd-HH-MM-ss') + '.csv';
-	const driveFile = await addFile(user, path, fileName);
+	const driveFile = await addFile(user, path, fileName, null, null, true);

 	logger.succ(`Exported to: ${driveFile.id}`);
 	cleanup();
--- a/src/queue/processors/db/import-following.ts
+++ b/src/queue/processors/db/import-following.ts
@ -35,7 +35,8 @@ export async function importFollowing(job: Bull.Job, done: any): Promise<void> {
 		linenum++;

 		try {
-			const { username, host } = parseAcct(line.trim());
+			const acct = line.split(',')[0].trim();
+			const { username, host } = parseAcct(acct);

 			let target = isSelfHost(host!) ? await Users.findOne({
 				host: null,
--- a/src/server/api/endpoints/drive/files.ts
+++ b/src/server/api/endpoints/drive/files.ts
@ -37,7 +37,7 @@ export const meta = {
 		},

 		type: {
-			validator: $.optional.str.match(/^[a-zA-Z\/\-\*]+$/)
+			validator: $.optional.str.match(/^[a-zA-Z\/\-*]+$/)
 		}
 	},

--- a/src/server/api/endpoints/drive/stream.ts
+++ b/src/server/api/endpoints/drive/stream.ts
@ -27,7 +27,7 @@ export const meta = {
 		},

 		type: {
-			validator: $.optional.str.match(/^[a-zA-Z\/\-\*]+$/)
+			validator: $.optional.str.match(/^[a-zA-Z\/\-*]+$/)
 		}
 	},

--- a/src/server/api/index.ts
+++ b/src/server/api/index.ts
@ -52,7 +52,7 @@ for (const endpoint of endpoints) {
 	} else {
 		if (endpoint.name.includes('-')) {
 			// 後方互換性のため
-			router.post(`/${endpoint.name.replace(/\-/g, '_')}`, handler.bind(null, endpoint));
+			router.post(`/${endpoint.name.replace(/-/g, '_')}`, handler.bind(null, endpoint));
 		}
 		router.post(`/${endpoint.name}`, handler.bind(null, endpoint));
 	}
--- a/src/server/api/openapi/schemas.ts
+++ b/src/server/api/openapi/schemas.ts
@ -18,7 +18,7 @@ export function convertSchemaToOpenApiSchema(schema: Schema) {
 	const res: any = schema;

 	if (schema.type === 'object' && schema.properties) {
-		res.required = Object.entries(schema.properties).filter(([k, v]) => v.optional !== true).map(([k]) => k);
+		res.required = Object.entries(schema.properties).filter(([k, v]) => !v.optional).map(([k]) => k);

 		for (const k of Object.keys(schema.properties)) {
 			res.properties[k] = convertSchemaToOpenApiSchema(schema.properties[k]);
--- a/src/server/api/service/discord.ts
+++ b/src/server/api/service/discord.ts
@ -203,12 +203,8 @@ router.get('/dc/cb', async ctx => {
 		}

 		const profile = await UserProfiles.createQueryBuilder()
-			.where('discord @> :discord', {
-				discord: {
-					id: id,
-				},
-			})
-			.andWhere('userHost IS NULL')
+			.where('"discordId" = :id', { id: id })
+			.andWhere('"userHost" IS NULL')
 			.getOne();

 		if (profile == null) {
--- a/src/server/api/service/github.ts
+++ b/src/server/api/service/github.ts
@ -193,12 +193,8 @@ router.get('/gh/cb', async ctx => {
 		}

 		const link = await UserProfiles.createQueryBuilder()
-			.where('github @> :github', {
-				github: {
-					id: id,
-				},
-			})
-			.andWhere('userHost IS NULL')
+			.where('"githubId" = :id', { id: id })
+			.andWhere('"userHost" IS NULL')
 			.getOne();

 		if (link == null) {
--- a/src/server/api/service/twitter.ts
+++ b/src/server/api/service/twitter.ts
@ -141,12 +141,8 @@ router.get('/tw/cb', async ctx => {
 		const result = await twAuth!.done(JSON.parse(twCtx), ctx.query.oauth_verifier);

 		const link = await UserProfiles.createQueryBuilder()
-			.where('twitter @> :twitter', {
-				twitter: {
-					userId: result.userId,
-				},
-			})
-			.andWhere('userHost IS NULL')
+			.where('"twitterUserId" = :id', { id: result.userId })
+			.andWhere('"userHost" IS NULL')
 			.getOne();

 		if (link == null) {
--- a/src/services/drive/add-file.ts
+++ b/src/services/drive/add-file.ts
@ -393,6 +393,8 @@ export default async function(

 		if (isLink) {
 			file.url = url;
+			file.thumbnailUrl = url;
+			file.webpublicUrl = url;
 		}
 	}

--- a/tslint.json
+++ b/tslint.json
@ -34,7 +34,7 @@
 		"radix": false,
 		"ban-types": [
 			true,
-			"Object"
+			["Object", "Use {} instead."]
 		],
 		"ban": [
 			true,
--- a/webpack.config.ts
+++ b/webpack.config.ts
@ -95,7 +95,7 @@ module.exports = {
 				loader: 'css-loader'
 			}, postcss]
 		}, {
-			test: /\.(eot|woff|woff2|svg|ttf)([\?]?.*)$/,
+			test: /\.(eot|woff|woff2|svg|ttf)([?]?.*)$/,
 			loader: 'url-loader'
 		}, {
 			test: /\.json5$/,
Author	SHA1	Message	Date
syuilo	1092532292	Merge branch 'develop'	2019-05-05 20:33:44 +09:00
syuilo	8a79ba0e2b	11.11.0	2019-05-05 20:33:29 +09:00
syuilo	ca2949fbb4	MisskeyPagesにリストから選択関数を追加	2019-05-05 20:31:15 +09:00
syuilo	17b373ac07	✌️	2019-05-05 20:16:05 +09:00
syuilo	7aa66f438f	Resolve #4853	2019-05-05 20:12:35 +09:00
syuilo	73641fd78d	Fix #4852	2019-05-05 15:17:29 +09:00
syuilo	64aac9d6ad	Fix #4862	2019-05-05 15:12:25 +09:00
syuilo	2be13736c8	Update user-profile.ts #4809	2019-05-05 09:42:38 +09:00
MeiMei	ff4f5fec1d	meidg (#4835 )	2019-05-05 09:29:15 +09:00
Satsuki Yanagi	7d64f8abe4	外部サービス連携後のPackedUserがその情報を持つように (#4850 )	2019-05-05 09:28:55 +09:00
Satsuki Yanagi	88e6929e9f	外部サービス連携ログインリンクにアイコン追加 (#4858 )	2019-05-05 09:28:23 +09:00
Satsuki Yanagi	5fb0a995dd	様々な修正 (#4859 ) Typo, Redundant code, Syntax error の修正	2019-05-05 09:27:55 +09:00
Satsuki Yanagi	58a04ce1a5	ログアウトの処理と外部サービス連携Viewがセッションクッキーを作らないように (#4856 )	2019-05-05 04:04:30 +09:00
syuilo	f74e0d9123	Merge branch 'develop'	2019-05-04 15:21:51 +09:00
syuilo	c6249b82d4	11.10.1	2019-05-04 15:21:35 +09:00
syuilo	d6131c0b09	MisskeyPagesでページブロックを削除できなくなっていた問題を修正	2019-05-04 15:14:02 +09:00
syuilo	e62c810b7c	Use node 12	2019-05-04 14:53:46 +09:00
syuilo	2851a1a7ef	Update dependencies 🚀	2019-05-04 14:47:28 +09:00
syuilo	12cd2709d6	Merge branch 'develop'	2019-05-03 18:58:54 +09:00
syuilo	bf54e58873	11.10.0	2019-05-03 18:58:09 +09:00
syuilo	6b473e3a5c	Fix #4840	2019-05-03 18:55:24 +09:00
syuilo	4b68abd963	割った余りを求める関数をMisskeyPagesに追加	2019-05-03 18:48:40 +09:00
Satsuki Yanagi	0e764a2b3e	Fix external service authentication (#4846 )	2019-05-03 18:38:19 +09:00
MeiMei	9d1ed1eb0d	Some import and export fixes (#4842 ) * Fix: Mastodon v2.8.0 のフォローリストがインポートできない * Fix: エクスポートリクエストに失敗してもエラーが出ない (#4821) * エクスポートファイルでは同一ハッシュチェックをしないように	2019-05-03 18:33:25 +09:00
syuilo	a09a3465a2	Merge branch 'develop' of https://github.com/syuilo/misskey into develop	2019-05-03 14:49:40 +09:00
syuilo	001969efaf	Improve usability	2019-05-03 14:49:22 +09:00
Acid Chicken (硫酸鶏)	e7c515da9a	Update README.md [AUTOGEN] (#4839 )	2019-05-03 14:34:41 +09:00
Acid Chicken (硫酸鶏)	8367c7dd49	Update README.md [AUTOGEN] (#4837 )	2019-05-03 14:32:09 +09:00
syuilo	55e6cae240	Fix #4834	2019-05-03 09:16:31 +09:00
syuilo	5553c3fb17	Improve usability	2019-05-03 08:27:46 +09:00
syuilo	026265cb1e	Merge branch 'develop' of https://github.com/syuilo/misskey into develop	2019-05-03 08:22:51 +09:00
syuilo	289c76a802	Disable ServiceWorker	2019-05-03 08:22:44 +09:00
Acid Chicken (硫酸鶏)	7c1bc1d6bc	Update README.md [AUTOGEN] (#4832 )	2019-05-02 19:44:59 +09:00
Acid Chicken (硫酸鶏)	90cf0d32b5	Update README.md [AUTOGEN] (#4827 )	2019-05-02 18:48:48 +09:00