diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-03-05 08:24:26 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-03-05 08:24:26 +0900 |
| commit | a1f3323fa5f34092e381bcc4555d51476707edd6 (patch) | |
| tree | a6ec172a8c7f6959d130c4b5f4aaf39696f11d86 /src/server | |
| parent | Fix #4415 (diff) | |
| parent | Fix #4413 (#4417) (diff) | |
| download | misskey-a1f3323fa5f34092e381bcc4555d51476707edd6.tar.gz misskey-a1f3323fa5f34092e381bcc4555d51476707edd6.tar.bz2 misskey-a1f3323fa5f34092e381bcc4555d51476707edd6.zip | |
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/proxy/proxy-media.ts | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/server/proxy/proxy-media.ts b/src/server/proxy/proxy-media.ts index 8560c0e1ef..379dc1f842 100644 --- a/src/server/proxy/proxy-media.ts +++ b/src/server/proxy/proxy-media.ts @@ -101,7 +101,11 @@ async function detectMine(path: string) { readable.destroy(); const type = fileType(buffer); 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)) { res(['image/svg+xml', 'svg']); } else { |