Merge branch 'develop'

7 files changed, 12 insertions, 5 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e8c13e70c..64de67ed26 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 e7489ef2ef..2dddb678f6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.8.0-2",
+	"version": "11.8.1",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",
@@ -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",
diff --git a/src/client/app/mios.ts b/src/client/app/mios.ts
index b69c340528..191b72e5bf 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 589579b8e0..ac4d9a5601 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 1b0ce6936c..4f287406d1 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 36299b1f29..3a5800f00b 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) {
diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts
index e569180354..4cb36adbfc 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) {