natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/syuilo/misskey into develop

This commit is contained in:
syuilo 2019-03-05 08:24:26 +09:00
parent 494796a7f0 94f2c20d35
commit a1f3323fa5
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/proxy/proxy-media.ts
View File

@ -101,7 +101,11 @@ async function detectMine(path: string) {
readable.destroy(); readable.destroy();
const type = fileType(buffer); const type = fileType(buffer);
if (type) { if (type) {
res([type.mime, type.ext]); if (type.mime == 'application/xml' && checkSvg(path)) {
res(['image/svg+xml', 'svg']);
} else {
res([type.mime, type.ext]);
}
} else if (checkSvg(path)) { } else if (checkSvg(path)) {
res(['image/svg+xml', 'svg']); res(['image/svg+xml', 'svg']);
} else { } else {

6
src/services/drive/add-file.ts
View File

@ -310,7 +310,11 @@ export default async function(
readable.destroy(); readable.destroy();
const type = fileType(buffer); const type = fileType(buffer);
if (type) { if (type) {
res([type.mime, type.ext]); if (type.mime == 'application/xml' && checkSvg(path)) {
res(['image/svg+xml', 'svg']);
} else {
res([type.mime, type.ext]);
}
} else if (checkSvg(path)) { } else if (checkSvg(path)) {
res(['image/svg+xml', 'svg']); res(['image/svg+xml', 'svg']);
} else { } else {