summaryrefslogtreecommitdiff
path: root/src/services
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-07-05 17:44:23 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-07-05 17:44:23 +0900
commit26f2ae093bcb2e9eba703e9f865c264beb04dc99 (patch)
treebe89131a8f1617a249e73f561ef52f217ba8dcb3 /src/services
parentハッシュタグのトレンドの計算を5分単位で丸める (#5107) (diff)
downloadsharkey-26f2ae093bcb2e9eba703e9f865c264beb04dc99.tar.gz
sharkey-26f2ae093bcb2e9eba703e9f865c264beb04dc99.tar.bz2
sharkey-26f2ae093bcb2e9eba703e9f865c264beb04dc99.zip
APNGでもMIME typeはimage/pngにするように (#5100)
* APNGでもMIME typeはimage/pngにするように * Revert "APNGでもMIME typeはimage/pngにするように" This reverts commit e579eb2bf44f526cabfa9bd4adc6b4fa84727e3b. * APNGはファイル送信時のみimage/pngにするように
Diffstat (limited to 'src/services')
-rw-r--r--src/services/drive/add-file.ts2
-rw-r--r--src/services/drive/image-processor.ts2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts
index e7b1e2a812..2f0d5d6265 100644
--- a/src/services/drive/add-file.ts
+++ b/src/services/drive/add-file.ts
@@ -207,6 +207,8 @@ export async function generateAlts(path: string, type: string, generateWeb: bool
* Upload to ObjectStorage
*/
async function upload(key: string, stream: fs.ReadStream | Buffer, type: string, filename?: string) {
+ if (type === 'image/apng') type = 'image/png';
+
const meta = await fetchMeta();
const minio = new Minio.Client({
diff --git a/src/services/drive/image-processor.ts b/src/services/drive/image-processor.ts
index 919d9ce138..4b8db0e0c8 100644
--- a/src/services/drive/image-processor.ts
+++ b/src/services/drive/image-processor.ts
@@ -97,6 +97,6 @@ export async function convertToApng(path: string): Promise<IImage> {
return {
data,
ext: 'apng',
- type: 'image/vnd.mozilla.apng'
+ type: 'image/apng'
};
}