From 9dd0ce8feb72df83d3cc2f53cf3e6c1fdac77aa1 Mon Sep 17 00:00:00 2001 From: Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com> Date: Wed, 1 May 2019 22:56:18 +0900 Subject: [PATCH 1/4] Fix TypeScript semantic error (#4828) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ビルドの時こういうエラーが出てます src/misc/aiscript/evaluator.ts(2,29): error TS7016: Could not find a declaration file for module 'seedrandom' --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index e7489ef2e..8f3b07235 100644 --- a/package.json +++ b/package.json @@ -80,6 +80,7 @@ "@types/request-promise-native": "1.0.15", "@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", From efe358172ab0c704fa31b7d2a6beba738239b325 Mon Sep 17 00:00:00 2001 From: Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com> Date: Thu, 2 May 2019 06:24:32 +0900 Subject: [PATCH 2/4] Remove unwanted ! character in user token regex (#4830) --- src/client/app/mios.ts | 2 +- src/server/api/service/discord.ts | 2 +- src/server/api/service/github.ts | 2 +- src/server/api/service/twitter.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/client/app/mios.ts b/src/client/app/mios.ts index b69c34052..191b72e5b 100644 --- a/src/client/app/mios.ts +++ b/src/client/app/mios.ts @@ -195,7 +195,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) { diff --git a/src/server/api/service/discord.ts b/src/server/api/service/discord.ts index 589579b8e..ac4d9a560 100644 --- a/src/server/api/service/discord.ts +++ b/src/server/api/service/discord.ts @@ -13,7 +13,7 @@ import { ILocalUser } from '../../../models/entities/user'; import { ensure } from '../../../prelude/ensure'; function getUserToken(ctx: Koa.BaseContext) { - return ((ctx.headers['cookie'] || '').match(/i=(!\w+)/) || [null, null])[1]; + return ((ctx.headers['cookie'] || '').match(/i=(\w+)/) || [null, null])[1]; } function compareOrigin(ctx: Koa.BaseContext) { diff --git a/src/server/api/service/github.ts b/src/server/api/service/github.ts index 1b0ce6936..4f287406d 100644 --- a/src/server/api/service/github.ts +++ b/src/server/api/service/github.ts @@ -13,7 +13,7 @@ import { ILocalUser } from '../../../models/entities/user'; import { ensure } from '../../../prelude/ensure'; function getUserToken(ctx: Koa.BaseContext) { - return ((ctx.headers['cookie'] || '').match(/i=(!\w+)/) || [null, null])[1]; + return ((ctx.headers['cookie'] || '').match(/i=(\w+)/) || [null, null])[1]; } function compareOrigin(ctx: Koa.BaseContext) { diff --git a/src/server/api/service/twitter.ts b/src/server/api/service/twitter.ts index 36299b1f2..3a5800f00 100644 --- a/src/server/api/service/twitter.ts +++ b/src/server/api/service/twitter.ts @@ -12,7 +12,7 @@ import { ILocalUser } from '../../../models/entities/user'; import { ensure } from '../../../prelude/ensure'; function getUserToken(ctx: Koa.BaseContext) { - return ((ctx.headers['cookie'] || '').match(/i=(!\w+)/) || [null, null])[1]; + return ((ctx.headers['cookie'] || '').match(/i=(\w+)/) || [null, null])[1]; } function compareOrigin(ctx: Koa.BaseContext) { From 759d2ba6fb8d744f6d1dc707ff4d6c674585fae0 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 2 May 2019 17:15:14 +0900 Subject: [PATCH 3/4] Fix bug --- src/services/drive/add-file.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts index e56918035..4cb36adbf 100644 --- a/src/services/drive/add-file.ts +++ b/src/services/drive/add-file.ts @@ -406,6 +406,7 @@ export default async function( file.md5 = hash; file.name = detectedName; file.type = mime; + file.storedInternal = false; file = await DriveFiles.save(file); } catch (e) { From 6e1dd305ef1fa523dac22144598fd5d61ec1fe0f Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 2 May 2019 17:18:11 +0900 Subject: [PATCH 4/4] 11.8.1 --- CHANGELOG.md | 5 +++++ package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e8c13e70..64de67ed2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,11 @@ mongodb: 8. master ブランチに戻す 9. enjoy +11.8.1 (2019/05/02) +------------------- +### Fixes +* リモートファイルをキャッシュしないオプション有効時にファイルが作成できない問題を修正 + 11.8.0-2 (2019/05/01) ------------------- * 11.8.0 のリリース内容が 11.7.0 と同一だったのを修正 diff --git a/package.json b/package.json index 8f3b07235..2dddb678f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo ", - "version": "11.8.0-2", + "version": "11.8.1", "codename": "daybreak", "repository": { "type": "git",