From 0ba877fef1332bfa6eb24ce685ae357dabdf7d3d Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Tue, 26 Jun 2018 11:33:41 +0000 Subject: [PATCH 01/22] fix(package): update element-ui to version 2.4.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index de7bff6e73..683d20b7c1 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "diskusage": "0.2.4", "dompurify": "1.0.5", "elasticsearch": "15.0.0", - "element-ui": "2.4.1", + "element-ui": "2.4.2", "emojilib": "2.2.12", "escape-regexp": "0.0.1", "eslint": "5.0.1", From 1599e06ffb706ea998a04e6aceba83c443f8f6d0 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Wed, 27 Jun 2018 05:44:28 +0000 Subject: [PATCH 02/22] fix(package): update webpack to version 4.12.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 65f7203741..4888342dd5 100644 --- a/package.json +++ b/package.json @@ -213,7 +213,7 @@ "vuex-persistedstate": "^2.5.4", "web-push": "3.3.2", "webfinger.js": "2.6.6", - "webpack": "4.12.1", + "webpack": "4.12.2", "webpack-cli": "3.0.8", "websocket": "1.0.26", "ws": "5.2.1", From e41bc54d43253c832cca588751f625ff54fbf6f7 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Wed, 27 Jun 2018 13:14:20 +0000 Subject: [PATCH 03/22] fix(package): update mongodb to version 3.1.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 65f7203741..ad0d2bbbf9 100644 --- a/package.json +++ b/package.json @@ -152,7 +152,7 @@ "mkdirp": "0.5.1", "mocha": "5.2.0", "moji": "0.5.1", - "mongodb": "3.0.10", + "mongodb": "3.1.0", "monk": "6.0.6", "ms": "2.1.1", "nan": "2.10.0", From ee12027739bd7fd0281e5e01cbfb6050d1c3836f Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Wed, 27 Jun 2018 13:50:04 +0000 Subject: [PATCH 04/22] fix(package): update typescript-eslint-parser to version 16.0.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 262ca4d411..258fe710c2 100644 --- a/package.json +++ b/package.json @@ -196,7 +196,7 @@ "ts-node": "7.0.0", "tslint": "5.10.0", "typescript": "2.9.2", - "typescript-eslint-parser": "16.0.0", + "typescript-eslint-parser": "16.0.1", "uglify-es": "3.3.9", "url-loader": "1.0.1", "uuid": "3.3.0", From d1843e2e27a1e17b8447548f485c6a5a5c5f9d91 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Wed, 27 Jun 2018 18:24:42 +0000 Subject: [PATCH 05/22] fix(package): update @types/mongodb to version 3.0.22 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 258fe710c2..00adb6359e 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "@types/license-checker": "15.0.0", "@types/mkdirp": "0.5.2", "@types/mocha": "5.2.3", - "@types/mongodb": "3.0.21", + "@types/mongodb": "3.0.22", "@types/ms": "0.7.30", "@types/node": "10.3.6", "@types/nopt": "3.0.29", From 24b20b8d32b42e5c11da9075a00cb9c52ab25ff7 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Wed, 27 Jun 2018 18:36:19 +0000 Subject: [PATCH 06/22] fix(package): update @types/node to version 10.5.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 258fe710c2..3ea9f2a6f1 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "@types/mocha": "5.2.3", "@types/mongodb": "3.0.21", "@types/ms": "0.7.30", - "@types/node": "10.3.6", + "@types/node": "10.5.0", "@types/nopt": "3.0.29", "@types/parse5": "5.0.0", "@types/pug": "2.0.4", From 019fbf5268639c97c7e3cb2da3d240f8b76e9dc5 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 28 Jun 2018 00:39:26 +0000 Subject: [PATCH 07/22] fix(package): update @types/webpack to version 4.4.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 258fe710c2..761176275a 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "@types/speakeasy": "2.0.2", "@types/tmp": "0.0.33", "@types/uuid": "3.4.3", - "@types/webpack": "4.4.3", + "@types/webpack": "4.4.4", "@types/webpack-stream": "3.2.10", "@types/websocket": "0.0.39", "@types/ws": "5.1.2", From a23ef386ea8f79b1f0f3aa4532c77420675885a6 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 28 Jun 2018 16:21:35 +0900 Subject: [PATCH 08/22] Fix bug --- src/client/app/common/scripts/get-kao.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/app/common/scripts/get-kao.ts b/src/client/app/common/scripts/get-kao.ts index d380187510..645196132b 100644 --- a/src/client/app/common/scripts/get-kao.ts +++ b/src/client/app/common/scripts/get-kao.ts @@ -1,5 +1,5 @@ export default () => [ '(=^・・^=)', - 'v('ω')v', + 'v(\'ω\')v', '🐡( \'-\' 🐡 )ﾌｸﾞﾊﾟﾝﾁ!!!!' ][Math.floor(Math.random() * 3)]; From de557947617d14bdcce6e45e329b1e8cf60a970a Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 28 Jun 2018 16:24:55 +0900 Subject: [PATCH 09/22] 4.15.0 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 29c3181c03..44bffba5b2 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "misskey", "author": "syuilo ", - "version": "4.14.0", - "clientVersion": "1.0.6815", + "version": "4.15.0", + "clientVersion": "1.0.6878", "codename": "nighthike", "main": "./built/index.js", "private": true, From 436ded4f4fb16f387aa4bd9e692667cb25ec6f28 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 28 Jun 2018 18:49:23 +0900 Subject: [PATCH 10/22] Update README.md --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 7a10f5b811..197fd6952d 100644 --- a/README.md +++ b/README.md @@ -44,9 +44,6 @@ If you want to... :heart: Backers & Sponsors ---------------------------------------------------------------- -[![Backers][backers-image]][support-url] -[![Sponsors][sponsors-image]][support-url] - | ![][nagarus-icon] | ![][dansup-icon] | |:-:|:-:| | [nagarus][nagarus-link] | [dansup][dansup-link] | From 72a09434e3a0ac7b5cdf70b66f11b6f5dbb84a2e Mon Sep 17 00:00:00 2001 From: Marek Lach Date: Thu, 28 Jun 2018 13:35:25 +0100 Subject: [PATCH 11/22] Update en.yml --- locales/en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/en.yml b/locales/en.yml index 9bd1a1f024..c25e65d829 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -40,7 +40,7 @@ common: b: "What's happening?" c: "What’s on your mind?" d: "What do you want to talk about?" - e: "Write here!" + e: "Write your thoughts here!" f: "Waiting for your writing..." search: "Search" delete: "Delete" @@ -77,7 +77,7 @@ common: post-form: "Post form" messaging: "Messages" server: "Server info" - donation: "Donation" + donation: "Donations" nav: "Navigation" tips: "Tips" hashtags: "Hashtags" From 177510afdfd28957e8f834cc8cddf96f4b5d537c Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 28 Jun 2018 21:34:10 +0000 Subject: [PATCH 12/22] fix(package): update uuid to version 3.3.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 44bffba5b2..8bf1fc506d 100644 --- a/package.json +++ b/package.json @@ -199,7 +199,7 @@ "typescript-eslint-parser": "16.0.1", "uglify-es": "3.3.9", "url-loader": "1.0.1", - "uuid": "3.3.0", + "uuid": "3.3.2", "v-animate-css": "0.0.2", "vue": "2.5.16", "vue-cropperjs": "2.2.1", From 5e7bed8db38bbeb1666cb7632d62173656a41d51 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Fri, 29 Jun 2018 03:20:52 +0000 Subject: [PATCH 13/22] fix(package): update @types/mongodb to version 3.0.23 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 44bffba5b2..4aa93f9e6a 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "@types/license-checker": "15.0.0", "@types/mkdirp": "0.5.2", "@types/mocha": "5.2.3", - "@types/mongodb": "3.0.22", + "@types/mongodb": "3.0.23", "@types/ms": "0.7.30", "@types/node": "10.5.0", "@types/nopt": "3.0.29", From 6f975acbb6e43f7b5427940557110a7e65e6dec9 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Fri, 29 Jun 2018 03:30:21 +0000 Subject: [PATCH 14/22] fix(package): update @types/node to version 10.5.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 44bffba5b2..5065abec5b 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "@types/mocha": "5.2.3", "@types/mongodb": "3.0.22", "@types/ms": "0.7.30", - "@types/node": "10.5.0", + "@types/node": "10.5.1", "@types/nopt": "3.0.29", "@types/parse5": "5.0.0", "@types/pug": "2.0.4", From beae1c286058dd40cf958e2564c57b84bb20cd37 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Fri, 29 Jun 2018 12:19:14 +0000 Subject: [PATCH 15/22] fix(package): update webpack to version 4.14.0 Closes #1818 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 44bffba5b2..a62fb1cec8 100644 --- a/package.json +++ b/package.json @@ -213,7 +213,7 @@ "vuex-persistedstate": "^2.5.4", "web-push": "3.3.2", "webfinger.js": "2.6.6", - "webpack": "4.12.2", + "webpack": "4.14.0", "webpack-cli": "3.0.8", "websocket": "1.0.26", "ws": "5.2.1", From a1ba5b1316729f21b9f639f7fc8bc771980ae7a0 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Sat, 30 Jun 2018 02:53:27 +0000 Subject: [PATCH 16/22] fix(package): update @types/mongodb to version 3.1.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c53eb50ed2..04b6523d9a 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "@types/license-checker": "15.0.0", "@types/mkdirp": "0.5.2", "@types/mocha": "5.2.3", - "@types/mongodb": "3.0.23", + "@types/mongodb": "3.1.0", "@types/ms": "0.7.30", "@types/node": "10.5.1", "@types/nopt": "3.0.29", From 1673957aa68203813fd7a9c53f53429e05906f4d Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 1 Jul 2018 13:40:31 +0900 Subject: [PATCH 17/22] Update rate limit --- src/server/api/endpoints.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/api/endpoints.ts b/src/server/api/endpoints.ts index f613710c80..146de67253 100644 --- a/src/server/api/endpoints.ts +++ b/src/server/api/endpoints.ts @@ -509,7 +509,7 @@ const endpoints: Endpoint[] = [ withCredential: true, limit: { duration: ms('1hour'), - max: 120, + max: 300, minInterval: ms('1second') }, kind: 'note-write' From 5fb8f5a8c765c2c2a47cfbf2df8c51a3eca4c0c5 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 1 Jul 2018 13:44:24 +0900 Subject: [PATCH 18/22] Improve error message --- src/remote/activitypub/models/person.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts index 94a6cee0bc..83afd68268 100644 --- a/src/remote/activitypub/models/person.ts +++ b/src/remote/activitypub/models/person.ts @@ -52,7 +52,7 @@ export async function createPerson(value: any, resolver?: Resolver): Promise Date: Sun, 1 Jul 2018 13:46:34 +0900 Subject: [PATCH 19/22] Fix bug --- src/mfm/html.ts | 4 ++++ src/mfm/parse/index.ts | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/mfm/html.ts b/src/mfm/html.ts index 64208af88b..71b4739476 100644 --- a/src/mfm/html.ts +++ b/src/mfm/html.ts @@ -92,6 +92,10 @@ const handlers: { [key: string]: (window: any, token: any, mentionedRemoteUsers: }; export default (tokens: TextElement[], mentionedRemoteUsers: INote['mentionedRemoteUsers'] = []) => { + if (tokens == null) { + return null; + } + const { window } = new JSDOM(''); for (const token of tokens) { diff --git a/src/mfm/parse/index.ts b/src/mfm/parse/index.ts index 2b6a459b1e..8d71409e58 100644 --- a/src/mfm/parse/index.ts +++ b/src/mfm/parse/index.ts @@ -43,8 +43,7 @@ export type TextElement = { type: 'text', content: string } export type TextElementProcessor = (text: string, i: number) => TextElement | TextElement[]; export default (source: string): TextElement[] => { - - if (source == '') { + if (source == null || source == '') { return null; } From 597784a3e8f3d6ea161a1bc3b4952907762d940d Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Mon, 2 Jul 2018 02:03:58 +0000 Subject: [PATCH 20/22] fix(package): update hard-source-webpack-plugin to version 0.10.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c53eb50ed2..c5f29c023e 100644 --- a/package.json +++ b/package.json @@ -124,7 +124,7 @@ "gulp-typescript": "4.0.2", "gulp-uglify": "3.0.0", "gulp-util": "3.0.8", - "hard-source-webpack-plugin": "0.9.0", + "hard-source-webpack-plugin": "0.10.0", "highlight.js": "9.12.0", "html-minifier": "3.5.17", "http-signature": "1.2.0", From 9f730f23e90bfdf1fe078c3a6b59ae018f43a821 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Mon, 2 Jul 2018 14:59:29 +0000 Subject: [PATCH 21/22] fix(package): update vue-js-modal to version 1.3.16 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4861f3492c..891defc58d 100644 --- a/package.json +++ b/package.json @@ -203,7 +203,7 @@ "v-animate-css": "0.0.2", "vue": "2.5.16", "vue-cropperjs": "2.2.1", - "vue-js-modal": "1.3.15", + "vue-js-modal": "1.3.16", "vue-json-tree-view": "2.1.4", "vue-loader": "15.2.4", "vue-router": "3.0.1", From 810b4c719147ca3c5325551dafccf86dbd9816e1 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Mon, 2 Jul 2018 16:13:03 +0000 Subject: [PATCH 22/22] fix(package): update hard-source-webpack-plugin to version 0.10.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4861f3492c..300949a441 100644 --- a/package.json +++ b/package.json @@ -124,7 +124,7 @@ "gulp-typescript": "4.0.2", "gulp-uglify": "3.0.0", "gulp-util": "3.0.8", - "hard-source-webpack-plugin": "0.10.0", + "hard-source-webpack-plugin": "0.10.1", "highlight.js": "9.12.0", "html-minifier": "3.5.17", "http-signature": "1.2.0",