Merge branch 'develop'

This commit is contained in:
syuilo 2019-05-02 17:18:34 +09:00
commit 9fb7c4091f
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
7 changed files with 12 additions and 5 deletions

View File

@ -42,6 +42,11 @@ mongodb:
8. master ブランチに戻す 8. master ブランチに戻す
9. enjoy 9. enjoy
11.8.1 (2019/05/02)
-------------------
### Fixes
* リモートファイルをキャッシュしないオプション有効時にファイルが作成できない問題を修正
11.8.0-2 (2019/05/01) 11.8.0-2 (2019/05/01)
------------------- -------------------
* 11.8.0 のリリース内容が 11.7.0 と同一だったのを修正 * 11.8.0 のリリース内容が 11.7.0 と同一だったのを修正

View File

@ -1,7 +1,7 @@
{ {
"name": "misskey", "name": "misskey",
"author": "syuilo <i@syuilo.com>", "author": "syuilo <i@syuilo.com>",
"version": "11.8.0-2", "version": "11.8.1",
"codename": "daybreak", "codename": "daybreak",
"repository": { "repository": {
"type": "git", "type": "git",
@ -80,6 +80,7 @@
"@types/request-promise-native": "1.0.15", "@types/request-promise-native": "1.0.15",
"@types/request-stats": "3.0.0", "@types/request-stats": "3.0.0",
"@types/rimraf": "2.0.2", "@types/rimraf": "2.0.2",
"@types/seedrandom": "2.4.28",
"@types/sharp": "0.22.1", "@types/sharp": "0.22.1",
"@types/showdown": "1.9.2", "@types/showdown": "1.9.2",
"@types/speakeasy": "2.0.4", "@types/speakeasy": "2.0.4",

View File

@ -195,7 +195,7 @@ export default class MiOS extends EventEmitter {
}); });
} else { } else {
// Get token from cookie or localStorage // 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 => { fetchme(i, me => {
if (me) { if (me) {

View File

@ -13,7 +13,7 @@ import { ILocalUser } from '../../../models/entities/user';
import { ensure } from '../../../prelude/ensure'; import { ensure } from '../../../prelude/ensure';
function getUserToken(ctx: Koa.BaseContext) { 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) { function compareOrigin(ctx: Koa.BaseContext) {

View File

@ -13,7 +13,7 @@ import { ILocalUser } from '../../../models/entities/user';
import { ensure } from '../../../prelude/ensure'; import { ensure } from '../../../prelude/ensure';
function getUserToken(ctx: Koa.BaseContext) { 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) { function compareOrigin(ctx: Koa.BaseContext) {

View File

@ -12,7 +12,7 @@ import { ILocalUser } from '../../../models/entities/user';
import { ensure } from '../../../prelude/ensure'; import { ensure } from '../../../prelude/ensure';
function getUserToken(ctx: Koa.BaseContext) { 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) { function compareOrigin(ctx: Koa.BaseContext) {

View File

@ -406,6 +406,7 @@ export default async function(
file.md5 = hash; file.md5 = hash;
file.name = detectedName; file.name = detectedName;
file.type = mime; file.type = mime;
file.storedInternal = false;
file = await DriveFiles.save(file); file = await DriveFiles.save(file);
} catch (e) { } catch (e) {