summaryrefslogtreecommitdiff
path: root/src/server/proxy/proxy-media.ts
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-03-05 07:56:23 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-03-05 07:56:23 +0900
commit94f2c20d3515544b61a4800f8f4fef41c2fdbc38 (patch)
tree8d2dc1cb86696464957054359f04502f508d798f /src/server/proxy/proxy-media.ts
parentUpdate README.md [AUTOGEN] (#4411) (diff)
downloadsharkey-94f2c20d3515544b61a4800f8f4fef41c2fdbc38.tar.gz
sharkey-94f2c20d3515544b61a4800f8f4fef41c2fdbc38.tar.bz2
sharkey-94f2c20d3515544b61a4800f8f4fef41c2fdbc38.zip
Fix #4413 (#4417)
Diffstat (limited to 'src/server/proxy/proxy-media.ts')
-rw-r--r--src/server/proxy/proxy-media.ts6
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 {