0.0.21 fit contain

README.md

@@ -4,8 +4,6 @@
 
 Misskeyの/proxyが単体で動作します（Misskeyのコードがほぼそのまま移植されています）。
 
-/proxyは画像ではないと403を返しますが、Media Proxyではそのまま内容を送信します。
-
 **Fastifyプラグインとして動作する気がします。**  
 `pnpm start`は[fastify-cli](https://github.com/fastify/fastify-cli)が動作します。
 

built/download.js

@@ -61,11 +61,16 @@ export async function downloadUrl(url, path, settings = defaultDownloadConfig) {
         }
         const contentDisposition = res.headers['content-disposition'];
         if (contentDisposition != null) {
+            try {
                 const parsed = parse(contentDisposition);
                 if (parsed.parameters.filename) {
                     filename = parsed.parameters.filename;
                 }
             }
+            catch (e) {
+                console.log(`Failed to parse content-disposition: ${contentDisposition}\n${e}`);
+            }
+        }
     }).on('downloadProgress', (progress) => {
         if (progress.transferred > settings.maxSize) {
             console.log(`maxSize exceeded (${progress.transferred} > ${settings.maxSize}) on downloadProgress`);

built/index.js

@@ -130,7 +130,8 @@ async function proxyHandler(request, reply) {
         else if ('badge' in request.query) {
             const mask = (await sharpBmp(file.path, file.mime))
                 .resize(96, 96, {
-                fit: 'inside',
+                fit: 'contain',
+                position: 'centre',
                 withoutEnlargement: false,
             })
                 .greyscale()

package.json

@@ -1,6 +1,6 @@
 {
   "name": "misskey-media-proxy",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "The Media Proxy for Misskey",
   "main": "built/index.js",
   "packageManager": "pnpm@7.28.0",

src/download.ts

@@ -82,10 +82,14 @@ export async function downloadUrl(url: string, path: string, settings:DownloadCo
 
         const contentDisposition = res.headers['content-disposition'];
         if (contentDisposition != null) {
+            try {
                 const parsed = parse(contentDisposition);
                 if (parsed.parameters.filename) {
                     filename = parsed.parameters.filename;
                 }
+            } catch (e) {
+                console.log(`Failed to parse content-disposition: ${contentDisposition}\n${e}`);
+            }
         }
     }).on('downloadProgress', (progress: Got.Progress) => {
         if (progress.transferred > settings.maxSize) {

src/index.ts

@@ -174,7 +174,8 @@ async function proxyHandler(request: FastifyRequest<{ Params: { url: string; };
         } else if ('badge' in request.query) {
             const mask = (await sharpBmp(file.path, file.mime))
                 .resize(96, 96, {
-                    fit: 'inside',
+                    fit: 'contain',
+                    position: 'centre',
                     withoutEnlargement: false,
                 })
                 .greyscale()