mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-10-31 23:31:48 +09:00
Code

APNGでもMIME typeはimage/pngにするように (#5100)

Browse Source 
* APNGでもMIME typeはimage/pngにするように

* Revert "APNGでもMIME typeはimage/pngにするように"

This reverts commit e579eb2bf44f526cabfa9bd4adc6b4fa84727e3b.

* APNGはファイル送信時のみimage/pngにするように
This commit is contained in:
MeiMei 2019-07-05 17:44:23 +09:00 committed by syuilo
parent 6a53ccf814
commit 26f2ae093b
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/file/send-drive-file.ts
View File

@ -42,7 +42,7 @@ export default async function(ctx: Koa.BaseContext) {
ctx.set('Content-Disposition', contentDisposition('inline', `${rename(file.name, { suffix: '-thumb', extname: '.jpeg' })}`));
ctx.body = InternalStorage.read(key);
} else if (isWebpublic) {
ctx.set('Content-Type', file.type);
ctx.set('Content-Type', file.type === 'image/apng' ? 'image/png' : file.type);
ctx.set('Content-Disposition', contentDisposition('inline', `${rename(file.name, { suffix: '-web' })}`));
ctx.body = InternalStorage.read(key);
} else {

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

@ -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({

2
src/services/drive/image-processor.ts
View File

@ -97,6 +97,6 @@ export async function convertToApng(path: string): Promise<IImage> {
return {
data,
ext: 'apng',
type: 'image/vnd.mozilla.apng'
type: 'image/apng'
};
}