From f67e4b9b04b15b4da16c175d15b05d5fe319884b Mon Sep 17 00:00:00 2001
From: Jayvin Hernandez <gogojayvin923@gmail.com>
Date: Thu, 6 Feb 2025 17:48:41 -0800
Subject: [PATCH 01/24] feat: a very cool zoomy thing, pc only :(

---
 src/pages/view/[id].tsx | 93 +++++++++++++++++++++++++++++------------
 1 file changed, 66 insertions(+), 27 deletions(-)

diff --git a/src/pages/view/[id].tsx b/src/pages/view/[id].tsx
index afcc00882..242136f95 100644
--- a/src/pages/view/[id].tsx
+++ b/src/pages/view/[id].tsx
@@ -37,6 +37,7 @@ export default function EmbeddedFile({
   const [opened, setOpened] = useState(pass || !!file.password);
   const [password, setPassword] = useState('');
   const [error, setError] = useState('');
+  const [scale, setScale] = useState(2);
 
   const [downloadWPass, setDownloadWPass] = useState(false);
 
@@ -66,28 +67,6 @@ export default function EmbeddedFile({
       videoEl = document.getElementById('video_content') as HTMLVideoElement,
       audioEl = document.getElementById('audio_content') as HTMLAudioElement;
 
-    if (mimeMatch?.groups?.img) {
-      const img = new Image();
-      img.addEventListener('load', function () {
-        // my best attempt of recreating
-        // firefox: https://searchfox.org/mozilla-central/source/dom/html/ImageDocument.cpp#271-276
-        // chromium-based: https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/core/html/image_document.cc
-
-        // keeps image original if smaller than screen
-        if (this.width <= window.innerWidth && this.height <= window.innerHeight) return;
-
-        // resizes to fit screen
-        const ratio = Math.min(innerHeight / this.naturalHeight, innerWidth / this.naturalWidth);
-        const newWidth = Math.max(1, Math.floor(ratio * this.naturalWidth));
-        const newHeight = Math.max(1, Math.floor(ratio * this.naturalHeight));
-
-        imageEl.width = newWidth;
-        imageEl.height = newHeight;
-      });
-
-      img.src = url || dataURL('/r');
-      file.imageProps = img;
-    }
     if (url) {
       if (mimeMatch?.groups?.img) imageEl.src = url;
       if (mimeMatch?.groups?.vid) videoEl.src = url;
@@ -105,10 +84,6 @@ export default function EmbeddedFile({
     if (!mimeMatch) return;
 
     updateFile();
-    window.addEventListener('resize', () => updateFile());
-    return () => {
-      window.removeEventListener('resize', () => updateFile());
-    };
   }, []);
 
   return (
@@ -213,9 +188,71 @@ export default function EmbeddedFile({
           alignItems: 'center',
           minHeight: '100vh',
           justifyContent: 'center',
+          overflow: 'hidden',
+        }}
+        onMouseDown={(e) => {
+          if (!mimeMatch?.groups?.img || e.button !== 0) return;
+          if (e.button !== 0) return;
+
+          e.preventDefault();
+          const imageEl = document.getElementById('image_content') as HTMLImageElement,
+            posX = e.pageX - (imageEl.x + imageEl.width / 2),
+            posY = e.pageY - (imageEl.y + imageEl.height / 2);
+
+          if (imageEl.style.transform.startsWith('translate')) return;
+
+          imageEl.style.transform = `translate(${posX * -scale}px, ${posY * -scale}px) scale(${scale})`;
+          return true;
+        }}
+        onMouseUp={(e) => {
+          if (!mimeMatch?.groups?.img || e.button !== 0) return;
+
+          const imageEl = document.getElementById('image_content') as HTMLImageElement;
+          if (!imageEl.style.transform.startsWith('translate')) return;
+          imageEl.style.transform = 'scale(1)';
+          setScale(2);
+          return true;
+        }}
+        onMouseMove={(e) => {
+          if (!mimeMatch?.groups?.img || e.button !== 0) return;
+          if (e.button !== 0) return;
+
+          const imageEl = document.getElementById('image_content') as HTMLImageElement,
+            posX = e.pageX - (imageEl.x + imageEl.width / 2),
+            posY = e.pageY - (imageEl.y + imageEl.height / 2);
+
+          if (!imageEl.style.transform.startsWith('translate')) return;
+          imageEl.style.transform = `translate(${posX * -scale}px, ${posY * -scale}px) scale(${scale})`;
+          return true;
+        }}
+        onWheel={(e) => {
+          if (!mimeMatch?.groups?.img || e.button !== 0) return;
+
+          const imageEl = document.getElementById('image_content') as HTMLImageElement,
+            posX = e.pageX - (imageEl.x + imageEl.width / 2),
+            posY = e.pageY - (imageEl.y + imageEl.height / 2);
+          if (!imageEl.style.transform.startsWith('translate')) return;
+          let newScale = 0;
+          if (e.deltaY < 0) newScale = scale + 0.25;
+          if (e.deltaY > 0) newScale = scale - 0.25 == 0 ? scale : scale - 0.25;
+          setScale(newScale);
+          imageEl.style.transform = `translate(${posX * -newScale}px, ${
+            posY * -newScale
+          }px) scale(${newScale})`;
         }}
       >
-        {mimeMatch?.groups?.img && <img src={dataURL('/r')} alt={dataURL('/r')} id='image_content' />}
+        {mimeMatch?.groups?.img && (
+          <img
+            src={dataURL('/r')}
+            alt={dataURL('/r')}
+            id='image_content'
+            style={{
+              transition: 'transform 0.25s ease',
+              maxHeight: '100vh',
+              maxWidth: '100vw',
+            }}
+          />
+        )}
 
         {mimeMatch?.groups?.vid && (
           <video
@@ -297,6 +334,8 @@ export const getServerSideProps: GetServerSideProps = async (context) => {
 
   // @ts-ignore workaround because next wont allow date
   file.createdAt = file.createdAt.toString();
+  // @ts-ignore ditto
+  file.expiresAt = file.createdAt.toString();
 
   const prismRender = Object.keys(exts).includes(file.name.split('.').pop());
   if (prismRender && !file.password)

From 9edb38fedc26829aac661e6d40905173b7bebb39 Mon Sep 17 00:00:00 2001
From: Jayvin Hernandez <gogojayvin923@gmail.com>
Date: Thu, 6 Feb 2025 17:49:30 -0800
Subject: [PATCH 02/24] fix: a sort of 404 for when dev'ing cuz next didn't
 care to compile the og 404

---
 src/server/decorators/notFound.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/server/decorators/notFound.ts b/src/server/decorators/notFound.ts
index 3d33f6106..5a52adc22 100644
--- a/src/server/decorators/notFound.ts
+++ b/src/server/decorators/notFound.ts
@@ -6,11 +6,9 @@ function notFound(fastify: FastifyInstance, _: unknown, done: () => void) {
   done();
 
   function notFound(this: FastifyReply) {
-    if (this.server.config.features.headless) {
-      return this.callNotFound();
-    } else {
-      return this.server.nextServer.render404(this.request.raw, this.raw);
-    }
+    if (process.env.NODE_ENV == 'development') return this.code(404).send('not found :(');
+    if (this.server.config.features.headless) return this.callNotFound();
+    return this.server.nextServer.render404(this.request.raw, this.raw);
   }
 }
 

From 7ef20827fb9dc3e3877d051f6a5a2606bceef9c8 Mon Sep 17 00:00:00 2001
From: Jayvin Hernandez <gogojayvin923@gmail.com>
Date: Thu, 6 Feb 2025 17:53:11 -0800
Subject: [PATCH 03/24] fix: at least check the password before anything else
 >:( and no more rawdogging it if the db doesn't have it!

---
 src/server/decorators/dbFile.ts  | 98 --------------------------------
 src/server/decorators/preFile.ts |  2 +-
 src/server/decorators/rawFile.ts | 39 ++++++-------
 src/server/index.ts              |  4 +-
 src/server/routes/raw.ts         | 44 +++++++-------
 src/server/routes/uploads.ts     | 12 ++--
 6 files changed, 51 insertions(+), 148 deletions(-)
 delete mode 100644 src/server/decorators/dbFile.ts

diff --git a/src/server/decorators/dbFile.ts b/src/server/decorators/dbFile.ts
deleted file mode 100644
index 565fb728c..000000000
--- a/src/server/decorators/dbFile.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import { File } from '@prisma/client';
-import { FastifyInstance, FastifyReply } from 'fastify';
-import fastifyPlugin from 'fastify-plugin';
-import exts from 'lib/exts';
-import { parseRange } from 'lib/utils/range';
-
-function dbFileDecorator(fastify: FastifyInstance, _, done) {
-  fastify.decorateReply('dbFile', dbFile);
-  done();
-
-  async function dbFile(this: FastifyReply, file: File) {
-    const { download } = this.request.query as { download?: string };
-
-    const ext = file.name.split('.').pop();
-    if (Object.keys(exts).includes(ext)) return this.server.nextHandle(this.request.raw, this.raw);
-
-    const size = await this.server.datasource.size(file.name);
-    if (size === null) return this.notFound();
-
-    if (this.request.headers.range) {
-      const [start, end] = parseRange(this.request.headers.range, size);
-      if (start >= size || end >= size) {
-        const buf = await datasource.get(file.name);
-        if (!buf) return this.server.nextServer.render404(this.request.raw, this.raw);
-
-        return this.type(file.mimetype || 'application/octet-stream')
-          .headers({
-            'Content-Length': size,
-            ...(file.originalName
-              ? {
-                  'Content-Disposition': `${download ? 'attachment; ' : ''}filename="${encodeURIComponent(
-                    file.originalName,
-                  )}"`,
-                }
-              : download && {
-                  'Content-Disposition': 'attachment;',
-                }),
-          })
-          .status(416)
-          .send(buf);
-      }
-
-      const buf = await datasource.range(file.name, start || 0, end);
-      if (!buf) return this.server.nextServer.render404(this.request.raw, this.raw);
-
-      return this.type(file.mimetype || 'application/octet-stream')
-        .headers({
-          'Content-Range': `bytes ${start}-${end}/${size}`,
-          'Accept-Ranges': 'bytes',
-          'Content-Length': end - start + 1,
-          ...(file.originalName
-            ? {
-                'Content-Disposition': `${download ? 'attachment; ' : ''}filename="${encodeURIComponent(
-                  file.originalName,
-                )}"`,
-              }
-            : download && {
-                'Content-Disposition': 'attachment;',
-              }),
-        })
-        .status(206)
-        .send(buf);
-    }
-
-    const data = await datasource.get(file.name);
-    if (!data) return this.server.nextServer.render404(this.request.raw, this.raw);
-
-    return this.type(file.mimetype || 'application/octet-stream')
-      .headers({
-        'Content-Length': size,
-        'Accept-Ranges': 'bytes',
-        ...(file.originalName
-          ? {
-              'Content-Disposition': `${download ? 'attachment; ' : ''}filename="${encodeURIComponent(
-                file.originalName,
-              )}"`,
-            }
-          : download && {
-              'Content-Disposition': 'attachment;',
-            }),
-      })
-      .status(200)
-      .send(data);
-  }
-}
-
-export default fastifyPlugin(dbFileDecorator, {
-  name: 'dbFile',
-  decorators: {
-    fastify: ['prisma', 'datasource', 'nextHandle', 'logger'],
-  },
-});
-
-declare module 'fastify' {
-  interface FastifyReply {
-    dbFile: (file: File) => Promise<void>;
-  }
-}
diff --git a/src/server/decorators/preFile.ts b/src/server/decorators/preFile.ts
index b6517a67a..9172409c0 100644
--- a/src/server/decorators/preFile.ts
+++ b/src/server/decorators/preFile.ts
@@ -30,6 +30,6 @@ export default fastifyPlugin(preFileDecorator, {
 
 declare module 'fastify' {
   interface FastifyReply {
-    preFile: (file: File) => Promise<boolean>;
+    preFile: (file: Partial<File>) => Promise<boolean>;
   }
 }
diff --git a/src/server/decorators/rawFile.ts b/src/server/decorators/rawFile.ts
index 9efc66420..67194d846 100644
--- a/src/server/decorators/rawFile.ts
+++ b/src/server/decorators/rawFile.ts
@@ -6,52 +6,53 @@ import { createBrotliCompress, createDeflate, createGzip } from 'zlib';
 import pump from 'pump';
 import { Transform } from 'stream';
 import { parseRange } from 'lib/utils/range';
+import { File } from '@prisma/client';
 
 function rawFileDecorator(fastify: FastifyInstance, _, done) {
   fastify.decorateReply('rawFile', rawFile);
   done();
 
-  async function rawFile(this: FastifyReply, id: string) {
+  async function rawFile(this: FastifyReply, file: Partial<File>) {
     const { download, compress = 'false' } = this.request.query as { download?: string; compress?: string };
-    const size = await this.server.datasource.size(id);
+    const size = await this.server.datasource.size(file.name);
     if (size === null) return this.notFound();
 
-    const mimetype = await guess(extname(id).slice(1));
+    const mimetype = await guess(extname(file.name).slice(1));
 
     if (this.request.headers.range) {
       const [start, end] = parseRange(this.request.headers.range, size);
       if (start >= size || end >= size) {
-        const buf = await datasource.get(id);
+        const buf = await datasource.get(file.name);
         if (!buf) return this.server.nextServer.render404(this.request.raw, this.raw);
 
-        return this.type(mimetype || 'application/octet-stream')
+        return this.type(file.mimetype || mimetype || 'application/octet-stream')
           .headers({
             'Content-Length': size,
-            ...(download && {
-              'Content-Disposition': 'attachment;',
-            }),
+            'Content-Disposition': `${download ? 'attachment; ' : ''}filename="${encodeURIComponent(
+              file.originalName ?? file.name,
+            )}`,
           })
           .status(416)
           .send(buf);
       }
 
-      const buf = await datasource.range(id, start || 0, end);
+      const buf = await datasource.range(file.name, start || 0, end);
       if (!buf) return this.server.nextServer.render404(this.request.raw, this.raw);
 
-      return this.type(mimetype || 'application/octet-stream')
+      return this.type(file.mimetype || mimetype || 'application/octet-stream')
         .headers({
           'Content-Range': `bytes ${start}-${end}/${size}`,
           'Accept-Ranges': 'bytes',
           'Content-Length': end - start + 1,
-          ...(download && {
-            'Content-Disposition': 'attachment;',
-          }),
+          'Content-Disposition': `${download ? 'attachment; ' : ''}filename="${encodeURIComponent(
+            file.originalName ?? file.name,
+          )}`,
         })
         .status(206)
         .send(buf);
     }
 
-    const data = await datasource.get(id);
+    const data = await datasource.get(file.name);
     if (!data) return this.server.nextServer.render404(this.request.raw, this.raw);
 
     if (
@@ -61,7 +62,7 @@ function rawFileDecorator(fastify: FastifyInstance, _, done) {
     )
       if (
         size > this.server.config.core.compression.threshold &&
-        mimetype.match(/^(image(?!\/(webp))|video(?!\/(webm))|text)/)
+        (file.mimetype || mimetype).match(/^(image(?!\/(webp))|vfileeo(?!\/(webm))|text)/)
       )
         return this.send(useCompress.call(this, data));
 
@@ -69,9 +70,9 @@ function rawFileDecorator(fastify: FastifyInstance, _, done) {
       .headers({
         'Content-Length': size,
         'Accept-Ranges': 'bytes',
-        ...(download && {
-          'Content-Disposition': 'attachment;',
-        }),
+        'Content-Disposition': `${download ? 'attachment; ' : ''}filename="${encodeURIComponent(
+          file.originalName ?? file.name,
+        )}`,
       })
       .status(200)
       .send(data);
@@ -115,6 +116,6 @@ export default fastifyPlugin(rawFileDecorator, {
 
 declare module 'fastify' {
   interface FastifyReply {
-    rawFile: (id: string) => Promise<void>;
+    rawFile: (file: Partial<File>) => Promise<void>;
   }
 }
diff --git a/src/server/index.ts b/src/server/index.ts
index 285946160..95a9d8c50 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -7,7 +7,6 @@ import { version } from '../../package.json';
 import fastify, { FastifyInstance, FastifyServerOptions } from 'fastify';
 import { createReadStream, existsSync, readFileSync } from 'fs';
 import { Worker } from 'worker_threads';
-import dbFileDecorator from './decorators/dbFile';
 import notFound from './decorators/notFound';
 import postFileDecorator from './decorators/postFile';
 import postUrlDecorator from './decorators/postUrl';
@@ -66,8 +65,7 @@ async function start() {
     .register(postUrlDecorator)
     .register(postFileDecorator)
     .register(preFileDecorator)
-    .register(rawFileDecorator)
-    .register(dbFileDecorator);
+    .register(rawFileDecorator);
 
   server.addHook('onRequest', (req, reply, done) => {
     if (config.features.headless) {
diff --git a/src/server/routes/raw.ts b/src/server/routes/raw.ts
index 59a643b13..f2b2d1786 100644
--- a/src/server/routes/raw.ts
+++ b/src/server/routes/raw.ts
@@ -10,28 +10,34 @@ export default async function rawRoute(this: FastifyInstance, req: FastifyReques
     where: {
       OR: [{ name: id }, { invisible: { invis: decodeURI(encodeURI(id)) } }],
     },
+    select: {
+      name: true,
+      originalName: true,
+      mimetype: true,
+      password: true,
+      favorite: true,
+      expiresAt: true,
+    },
   });
 
-  if (!file) return reply.rawFile(id);
-  else {
-    const failed = await reply.preFile(file);
-    if (failed) return reply.notFound();
-
-    if (file.password) {
-      if (!password)
-        return reply
-          .type('application/json')
-          .code(403)
-          .send({ error: 'password protected', url: `/view/${file.name}`, code: 403 });
-      const success = await checkPassword(password, file.password);
+  if (!file) return reply.notFound();
 
-      if (!success)
-        return reply
-          .type('application/json')
-          .code(403)
-          .send({ error: 'incorrect password', url: `/view/${file.name}`, code: 403 });
-    }
+  if (file.password) {
+    if (!password)
+      return reply
+        .type('application/json')
+        .code(403)
+        .send({ error: 'password protected', url: `/view/${file.name}`, code: 403 });
+    const success = await checkPassword(password, file.password);
 
-    return reply.rawFile(file.name);
+    if (!success)
+      return reply
+        .type('application/json')
+        .code(403)
+        .send({ error: 'incorrect password', url: `/view/${file.name}`, code: 403 });
   }
+
+  if (await reply.preFile(file)) return reply.notFound();
+
+  return reply.rawFile(file);
 }
diff --git a/src/server/routes/uploads.ts b/src/server/routes/uploads.ts
index b6c74ad0b..42713edbd 100644
--- a/src/server/routes/uploads.ts
+++ b/src/server/routes/uploads.ts
@@ -1,10 +1,9 @@
 import { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify';
-import exts from 'lib/exts';
 
 export default async function uploadsRoute(this: FastifyInstance, req: FastifyRequest, reply: FastifyReply) {
   const { id } = req.params as { id: string };
   if (id === '') return reply.notFound();
-  else if (id === 'dashboard' && !this.config.features.headless)
+  else if (id === 'dashboard' && !this.config.features.headless && this.config.uploader.route === '/')
     return this.nextServer.render(req.raw, reply.raw, '/dashboard');
 
   const file = await this.prisma.file.findFirst({
@@ -12,16 +11,13 @@ export default async function uploadsRoute(this: FastifyInstance, req: FastifyRe
       OR: [{ name: id }, { name: decodeURI(id) }, { invisible: { invis: decodeURI(encodeURI(id)) } }],
     },
   });
-  if (!file) return reply.rawFile(id);
+
+  if (!file) return reply.notFound();
 
   const failed = await reply.preFile(file);
   if (failed) return reply.notFound();
 
-  const ext = file.name.split('.').pop();
-
-  if (file.password || file.embed || file.mimetype.startsWith('text/') || Object.keys(exts).includes(ext))
-    return reply.redirect(`/view/${file.name}`);
-  else return reply.dbFile(file);
+  return this.nextServer.render(req.raw, reply.raw, `/view/${file.name}`);
 }
 
 export async function uploadsRouteOnResponse(

From 942dbd3a78824a4bb5aaeef413cd185eeb966ba5 Mon Sep 17 00:00:00 2001
From: Jayvin Hernandez <gogojayvin923@gmail.com>
Date: Thu, 6 Feb 2025 17:53:57 -0800
Subject: [PATCH 04/24] fix: just in case someone goes /upload(or
 /url)/dashboard

---
 src/server/routes/urls.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/routes/urls.ts b/src/server/routes/urls.ts
index b24dd7a65..26fb0deb5 100644
--- a/src/server/routes/urls.ts
+++ b/src/server/routes/urls.ts
@@ -3,7 +3,7 @@ import { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify';
 export default async function urlsRoute(this: FastifyInstance, req: FastifyRequest, reply: FastifyReply) {
   const { id } = req.params as { id: string };
   if (id === '') return reply.notFound();
-  else if (id === 'dashboard' && !this.config.features.headless)
+  else if (id === 'dashboard' && !this.config.features.headless && this.config.urls.route === '/')
     return this.nextServer.render(req.raw, reply.raw, '/dashboard');
 
   const url = await this.prisma.url.findFirst({

From 13826d0f4e526f23bb093d7c4610986f524acec3 Mon Sep 17 00:00:00 2001
From: Jayvin Hernandez <gogojayvin923@gmail.com>
Date: Thu, 6 Feb 2025 18:00:15 -0800
Subject: [PATCH 05/24] fix: whoopsids

---
 src/server/routes/raw.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/server/routes/raw.ts b/src/server/routes/raw.ts
index f2b2d1786..d2ce389bf 100644
--- a/src/server/routes/raw.ts
+++ b/src/server/routes/raw.ts
@@ -11,6 +11,7 @@ export default async function rawRoute(this: FastifyInstance, req: FastifyReques
       OR: [{ name: id }, { invisible: { invis: decodeURI(encodeURI(id)) } }],
     },
     select: {
+      id: true,
       name: true,
       originalName: true,
       mimetype: true,

From 17872c9eda3b1af45d7abf69c84e4dba17bf2fa6 Mon Sep 17 00:00:00 2001
From: Jayvin Hernandez <gogojayvin923@gmail.com>
Date: Thu, 6 Feb 2025 18:04:54 -0800
Subject: [PATCH 06/24] fix: size can be null if it doesn't exist

---
 src/scripts/clear-zero-byte.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/clear-zero-byte.ts b/src/scripts/clear-zero-byte.ts
index 50a4a20d2..013c15535 100644
--- a/src/scripts/clear-zero-byte.ts
+++ b/src/scripts/clear-zero-byte.ts
@@ -16,7 +16,7 @@ async function main() {
   for (let i = 0; i !== files.length; ++i) {
     const file = files[i];
     const size = await datasource.size(file.name);
-    if (size === 0) {
+    if (size === 0 || size == null) {
       toDelete.push(file.name);
     }
   }

From 8439facfb9e512ba4cad714ce1f8e558a801d111 Mon Sep 17 00:00:00 2001
From: Jayvin Hernandez <gogojayvin923@gmail.com>
Date: Thu, 6 Feb 2025 18:05:54 -0800
Subject: [PATCH 07/24] fix: sometimes it doesn't exists, oops

---
 src/pages/view/[id].tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/view/[id].tsx b/src/pages/view/[id].tsx
index 242136f95..b35f1f6f6 100644
--- a/src/pages/view/[id].tsx
+++ b/src/pages/view/[id].tsx
@@ -335,7 +335,7 @@ export const getServerSideProps: GetServerSideProps = async (context) => {
   // @ts-ignore workaround because next wont allow date
   file.createdAt = file.createdAt.toString();
   // @ts-ignore ditto
-  file.expiresAt = file.createdAt.toString();
+  if (file.expiresAt) file.expiresAt = file.createdAt.toString();
 
   const prismRender = Object.keys(exts).includes(file.name.split('.').pop());
   if (prismRender && !file.password)

From e02a6447576eab7f0b07736dc478abd1a0e2eb88 Mon Sep 17 00:00:00 2001
From: Jayvin Hernandez <gogojayvin923@gmail.com>
Date: Thu, 6 Feb 2025 18:06:16 -0800
Subject: [PATCH 08/24] notFix: force delete to avoid error

---
 src/lib/datasources/Local.ts | 2 +-
 src/lib/datasources/S3.ts    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/datasources/Local.ts b/src/lib/datasources/Local.ts
index 4f3506a01..62562f814 100644
--- a/src/lib/datasources/Local.ts
+++ b/src/lib/datasources/Local.ts
@@ -15,7 +15,7 @@ export class Local extends Datasource {
   }
 
   public async delete(file: string): Promise<void> {
-    await rm(join(this.path, file));
+    await rm(join(this.path, file), { force: true });
   }
 
   public async clear(): Promise<void> {
diff --git a/src/lib/datasources/S3.ts b/src/lib/datasources/S3.ts
index dfc441db2..356cc6939 100644
--- a/src/lib/datasources/S3.ts
+++ b/src/lib/datasources/S3.ts
@@ -31,7 +31,7 @@ export class S3 extends Datasource {
   }
 
   public async delete(file: string): Promise<void> {
-    await this.s3.removeObject(this.config.bucket, file);
+    await this.s3.removeObject(this.config.bucket, file, { forceDelete: true });
   }
 
   public async clear(): Promise<void> {

From 8f9731e87550c0e6d98bd56d66749b1a087bfe27 Mon Sep 17 00:00:00 2001
From: Jayvin Hernandez <gogojayvin923@gmail.com>
Date: Thu, 6 Feb 2025 19:11:14 -0800
Subject: [PATCH 09/24] feat: Do we really overcomplicate things? Added
 passwordy thingy to raw route. Use that instead!

---
 src/lib/utils/parser.ts          |  2 +-
 src/pages/api/auth/file.ts       | 40 -----------------
 src/pages/view/[id].tsx          | 74 +++++++-------------------------
 src/server/decorators/preFile.ts | 21 +++++++++
 src/server/routes/raw.ts         |  4 +-
 5 files changed, 38 insertions(+), 103 deletions(-)
 delete mode 100644 src/pages/api/auth/file.ts

diff --git a/src/lib/utils/parser.ts b/src/lib/utils/parser.ts
index d111bb56a..049fcf67a 100644
--- a/src/lib/utils/parser.ts
+++ b/src/lib/utils/parser.ts
@@ -3,7 +3,7 @@ import { bytesToHuman } from './bytes';
 import Logger from 'lib/logger';
 
 export type ParseValue = {
-  file?: File;
+  file?: Omit<Partial<File>, 'password'>;
   url?: Url;
   user?: User;
 
diff --git a/src/pages/api/auth/file.ts b/src/pages/api/auth/file.ts
deleted file mode 100644
index d1375b9dc..000000000
--- a/src/pages/api/auth/file.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import datasource from 'lib/datasource';
-import { guess } from 'lib/mimes';
-import prisma from 'lib/prisma';
-import { checkPassword } from 'lib/util';
-import { NextApiReq, NextApiRes, withZipline } from 'middleware/withZipline';
-import { extname } from 'path';
-
-async function handler(req: NextApiReq, res: NextApiRes) {
-  const { id, password } = req.query;
-  if (isNaN(Number(id))) return res.badRequest('invalid id');
-
-  const file = await prisma.file.findFirst({
-    where: {
-      id: Number(id),
-    },
-  });
-
-  if (!file) return res.notFound('file not found');
-  if (!password) return res.badRequest('no password provided');
-
-  const decoded = decodeURIComponent(password as string);
-
-  const valid = await checkPassword(decoded, file.password);
-  if (!valid) return res.badRequest('wrong password');
-
-  const data = await datasource.get(file.name);
-  if (!data) return res.notFound('file not found');
-
-  const size = await datasource.size(file.name);
-
-  const mimetype = await guess(extname(file.name));
-  res.setHeader('Content-Type', mimetype);
-  res.setHeader('Content-Length', size);
-
-  data.pipe(res);
-  data.on('error', () => res.notFound('file not found'));
-  data.on('end', () => res.end());
-}
-
-export default withZipline(handler);
diff --git a/src/pages/view/[id].tsx b/src/pages/view/[id].tsx
index b35f1f6f6..22d03b167 100644
--- a/src/pages/view/[id].tsx
+++ b/src/pages/view/[id].tsx
@@ -11,19 +11,20 @@ import Link from 'next/link';
 import { useRouter } from 'next/router';
 import { useEffect, useState } from 'react';
 import zconfig from 'lib/config';
-import { log } from 'server/util';
 
 export default function EmbeddedFile({
   file,
   user,
-  pass,
   prismRender,
   host,
   compress,
 }: {
-  file: File & { imageProps?: HTMLImageElement; thumbnail: Thumbnail };
+  file: Omit<Partial<File>, 'password'> & {
+    password: boolean;
+    imageProps?: HTMLImageElement;
+    thumbnail: Thumbnail;
+  };
   user: UserExtended;
-  pass: boolean;
   prismRender: boolean;
   host: string;
   compress?: boolean;
@@ -34,7 +35,7 @@ export default function EmbeddedFile({
     }`;
 
   const router = useRouter();
-  const [opened, setOpened] = useState(pass || !!file.password);
+  const [opened, setOpened] = useState(file.password);
   const [password, setPassword] = useState('');
   const [error, setError] = useState('');
   const [scale, setScale] = useState(2);
@@ -47,12 +48,12 @@ export default function EmbeddedFile({
   file.createdAt = new Date(file ? file.createdAt : 0);
 
   const check = async () => {
-    const res = await fetch(`/api/auth/file?id=${file.id}&password=${encodeURIComponent(password)}`);
+    const res = await fetch(dataURL('/r', password));
 
     if (res.ok) {
       setError('');
       if (prismRender) return router.push(`/code/${file.name}?password=${password}`);
-      updateFile(`/api/auth/file?id=${file.id}&password=${password}`);
+      updateFile(dataURL('/r', password));
       setOpened(false);
       setDownloadWPass(true);
     } else {
@@ -75,7 +76,7 @@ export default function EmbeddedFile({
   };
 
   useEffect(() => {
-    if (pass) {
+    if (file.password) {
       setOpened(true);
     }
   }, []);
@@ -282,7 +283,9 @@ export default function EmbeddedFile({
 
 export const getServerSideProps: GetServerSideProps = async (context) => {
   const { id } = context.params as { id: string };
-  const { compress = null } = context.query as unknown as { compress?: boolean };
+  const { compress = null } = context.query as {
+    compress?: string;
+  };
   const file = await prisma.file.findFirst({
     where: {
       OR: [{ name: id }, { invisible: { invis: decodeURI(encodeURI(id)) } }],
@@ -294,17 +297,6 @@ export const getServerSideProps: GetServerSideProps = async (context) => {
   let host = context.req.headers.host;
   if (!file) return { notFound: true };
 
-  const logger = log('view');
-
-  if (file.maxViews && file.views >= file.maxViews) {
-    await datasource.delete(file.name);
-    await prisma.file.delete({ where: { id: file.id } });
-
-    logger.child('file').info(`File ${file.name} has been deleted due to max views (${file.maxViews})`);
-
-    return { notFound: true };
-  }
-
   // @ts-ignore
   file.size = Number(file.size);
 
@@ -336,6 +328,8 @@ export const getServerSideProps: GetServerSideProps = async (context) => {
   file.createdAt = file.createdAt.toString();
   // @ts-ignore ditto
   if (file.expiresAt) file.expiresAt = file.createdAt.toString();
+  // @ts-ignore
+  file.password = !!file.password;
 
   const prismRender = Object.keys(exts).includes(file.name.split('.').pop());
   if (prismRender && !file.password)
@@ -345,58 +339,20 @@ export const getServerSideProps: GetServerSideProps = async (context) => {
         permanent: true,
       },
     };
-  else if (prismRender && file.password) {
-    const pass = file.password ? true : false;
-    // @ts-ignore
-    if (file.password) file.password = true;
+  else if (prismRender && file.password)
     return {
       props: {
         file,
         user,
-        pass,
         prismRender: true,
         host,
       },
     };
-  }
-
-  if (!file.mimetype.startsWith('image') && !file.mimetype.startsWith('video')) {
-    const { default: datasource } = await import('lib/datasource');
-
-    const data = await datasource.get(file.name);
-    if (!data) return { notFound: true };
-
-    // @ts-ignore
-    if (file.password) file.password = true;
-
-    return {
-      props: {
-        file,
-        user,
-        host,
-      },
-    };
-  }
-
-  // @ts-ignore
-  if (file.password) file.password = true;
-
-  await prisma.file.update({
-    where: {
-      id: file.id,
-    },
-    data: {
-      views: {
-        increment: 1,
-      },
-    },
-  });
 
   return {
     props: {
       file,
       user,
-      pass: file.password ? true : false,
       host,
       compress,
     },
diff --git a/src/server/decorators/preFile.ts b/src/server/decorators/preFile.ts
index 9172409c0..3df615e91 100644
--- a/src/server/decorators/preFile.ts
+++ b/src/server/decorators/preFile.ts
@@ -7,6 +7,17 @@ function preFileDecorator(fastify: FastifyInstance, _, done) {
   done();
 
   async function preFile(this: FastifyReply, file: File) {
+    await prisma.file.update({
+      where: {
+        id: file.id,
+      },
+      data: {
+        views: {
+          increment: 1,
+        },
+      },
+    });
+
     if (file.favorite) return false;
     if (file.expiresAt && file.expiresAt < new Date()) {
       await this.server.datasource.delete(file.name);
@@ -16,6 +27,16 @@ function preFileDecorator(fastify: FastifyInstance, _, done) {
 
       return true;
     }
+    if (file.maxViews && file.views >= file.maxViews) {
+      await datasource.delete(file.name);
+      await prisma.file.delete({ where: { id: file.id } });
+
+      this.server.logger
+        .child('file')
+        .info(`File ${file.name} has been deleted due to max views (${file.maxViews})`);
+
+      return true;
+    }
 
     return false;
   }
diff --git a/src/server/routes/raw.ts b/src/server/routes/raw.ts
index d2ce389bf..426da0f84 100644
--- a/src/server/routes/raw.ts
+++ b/src/server/routes/raw.ts
@@ -38,7 +38,5 @@ export default async function rawRoute(this: FastifyInstance, req: FastifyReques
         .send({ error: 'incorrect password', url: `/view/${file.name}`, code: 403 });
   }
 
-  if (await reply.preFile(file)) return reply.notFound();
-
-  return reply.rawFile(file);
+  return (await reply.preFile(file)) ? reply.notFound() : reply.rawFile(file);
 }

From 65590558f69fc9f466c367ed7c9deeabbaf93c86 Mon Sep 17 00:00:00 2001
From: Jayvin Hernandez <gogojayvin923@gmail.com>
Date: Thu, 6 Feb 2025 19:17:24 -0800
Subject: [PATCH 10/24] ack, message fix

---
 src/server/routes/raw.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/routes/raw.ts b/src/server/routes/raw.ts
index 426da0f84..b8005d632 100644
--- a/src/server/routes/raw.ts
+++ b/src/server/routes/raw.ts
@@ -28,7 +28,7 @@ export default async function rawRoute(this: FastifyInstance, req: FastifyReques
       return reply
         .type('application/json')
         .code(403)
-        .send({ error: 'password protected', url: `/view/${file.name}`, code: 403 });
+        .send({ error: 'incorrect protected', url: `/view/${file.name}`, code: 403 });
     const success = await checkPassword(password, file.password);
 
     if (!success)

From b6898b0ad8b1fb26299e61de48e37536698b6ef4 Mon Sep 17 00:00:00 2001
From: Jayvin Hernandez <gogojayvin923@gmail.com>
Date: Thu, 6 Feb 2025 19:27:45 -0800
Subject: [PATCH 11/24] facepalm

---
 src/server/routes/raw.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/routes/raw.ts b/src/server/routes/raw.ts
index b8005d632..cd6920b2b 100644
--- a/src/server/routes/raw.ts
+++ b/src/server/routes/raw.ts
@@ -28,7 +28,7 @@ export default async function rawRoute(this: FastifyInstance, req: FastifyReques
       return reply
         .type('application/json')
         .code(403)
-        .send({ error: 'incorrect protected', url: `/view/${file.name}`, code: 403 });
+        .send({ error: 'incorrect password', url: `/view/${file.name}`, code: 403 });
     const success = await checkPassword(password, file.password);
 
     if (!success)

From b8e29fe839644721156e426ea5a552964fff9a5d Mon Sep 17 00:00:00 2001
From: Jay <gogojayvin923@gmail.com>
Date: Fri, 7 Feb 2025 11:18:19 -0800
Subject: [PATCH 12/24] fix: it's a little shorter, didn't realize this works
 too

---
 src/server/decorators/notFound.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server/decorators/notFound.ts b/src/server/decorators/notFound.ts
index 5a52adc22..c730f2efb 100644
--- a/src/server/decorators/notFound.ts
+++ b/src/server/decorators/notFound.ts
@@ -6,8 +6,8 @@ function notFound(fastify: FastifyInstance, _: unknown, done: () => void) {
   done();
 
   function notFound(this: FastifyReply) {
-    if (process.env.NODE_ENV == 'development') return this.code(404).send('not found :(');
-    if (this.server.config.features.headless) return this.callNotFound();
+    if (this.server.config.features.headless || process.env.NODE_ENV == 'development')
+      return this.callNotFound();
     return this.server.nextServer.render404(this.request.raw, this.raw);
   }
 }

From d63a64cc900ddbc23cd32ca04715f1e8469d60cb Mon Sep 17 00:00:00 2001
From: Jay <gogojayvin923@gmail.com>
Date: Fri, 7 Feb 2025 16:40:25 -0800
Subject: [PATCH 13/24] there wasn't an export const config for this one

---
 src/pages/view/[id].tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/view/[id].tsx b/src/pages/view/[id].tsx
index 22d03b167..edf097ec0 100644
--- a/src/pages/view/[id].tsx
+++ b/src/pages/view/[id].tsx
@@ -10,7 +10,7 @@ import Head from 'next/head';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
 import { useEffect, useState } from 'react';
-import zconfig from 'lib/config';
+import config from 'lib/config';
 
 export default function EmbeddedFile({
   file,
@@ -305,12 +305,12 @@ export const getServerSideProps: GetServerSideProps = async (context) => {
     if (
       JSON.parse(context.req.headers['cf-visitor'] as string).scheme === 'https' ||
       proto === 'https' ||
-      zconfig.core.return_https
+      config.core.return_https
     )
       host = `https://${host}`;
     else host = `http://${host}`;
   } catch (e) {
-    if (proto === 'https' || zconfig.core.return_https) host = `https://${host}`;
+    if (proto === 'https' || config.core.return_https) host = `https://${host}`;
     else host = `http://${host}`;
   }
 

From 13bc033331e04cbc26c72449dd30886e3136dbaa Mon Sep 17 00:00:00 2001
From: Jay <gogojayvin923@gmail.com>
Date: Fri, 7 Feb 2025 16:41:15 -0800
Subject: [PATCH 14/24] got thumbnails working again :D

---
 src/server/decorators/rawFile.ts | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/server/decorators/rawFile.ts b/src/server/decorators/rawFile.ts
index 67194d846..e90a8c446 100644
--- a/src/server/decorators/rawFile.ts
+++ b/src/server/decorators/rawFile.ts
@@ -6,53 +6,57 @@ import { createBrotliCompress, createDeflate, createGzip } from 'zlib';
 import pump from 'pump';
 import { Transform } from 'stream';
 import { parseRange } from 'lib/utils/range';
-import { File } from '@prisma/client';
+import type { File, Thumbnail } from '@prisma/client';
 
 function rawFileDecorator(fastify: FastifyInstance, _, done) {
   fastify.decorateReply('rawFile', rawFile);
   done();
 
-  async function rawFile(this: FastifyReply, file: Partial<File>) {
+  async function rawFile(this: FastifyReply, file: Partial<File> & { thumbnail: Partial<Thumbnail> }) {
     const { download, compress = 'false' } = this.request.query as { download?: string; compress?: string };
-    const size = await this.server.datasource.size(file.name);
+    const isThumb = (this.request.params['id'] as string) === file.thumbnail?.name,
+      filename = isThumb ? file.thumbnail?.name : file.name,
+      fileMime = isThumb ? null : file.mimetype;
+
+    const size = await this.server.datasource.size(filename);
     if (size === null) return this.notFound();
 
-    const mimetype = await guess(extname(file.name).slice(1));
+    const mimetype = await guess(extname(filename).slice(1));
 
     if (this.request.headers.range) {
       const [start, end] = parseRange(this.request.headers.range, size);
       if (start >= size || end >= size) {
-        const buf = await datasource.get(file.name);
+        const buf = await datasource.get(filename);
         if (!buf) return this.server.nextServer.render404(this.request.raw, this.raw);
 
-        return this.type(file.mimetype || mimetype || 'application/octet-stream')
+        return this.type(fileMime || mimetype || 'application/octet-stream')
           .headers({
             'Content-Length': size,
             'Content-Disposition': `${download ? 'attachment; ' : ''}filename="${encodeURIComponent(
-              file.originalName ?? file.name,
+              isThumb ? filename : file.originalName ?? filename,
             )}`,
           })
           .status(416)
           .send(buf);
       }
 
-      const buf = await datasource.range(file.name, start || 0, end);
+      const buf = await datasource.range(filename, start || 0, end);
       if (!buf) return this.server.nextServer.render404(this.request.raw, this.raw);
 
-      return this.type(file.mimetype || mimetype || 'application/octet-stream')
+      return this.type(fileMime || mimetype || 'application/octet-stream')
         .headers({
           'Content-Range': `bytes ${start}-${end}/${size}`,
           'Accept-Ranges': 'bytes',
           'Content-Length': end - start + 1,
           'Content-Disposition': `${download ? 'attachment; ' : ''}filename="${encodeURIComponent(
-            file.originalName ?? file.name,
+            isThumb ? filename : file.originalName ?? filename,
           )}`,
         })
         .status(206)
         .send(buf);
     }
 
-    const data = await datasource.get(file.name);
+    const data = await datasource.get(filename);
     if (!data) return this.server.nextServer.render404(this.request.raw, this.raw);
 
     if (
@@ -62,7 +66,7 @@ function rawFileDecorator(fastify: FastifyInstance, _, done) {
     )
       if (
         size > this.server.config.core.compression.threshold &&
-        (file.mimetype || mimetype).match(/^(image(?!\/(webp))|vfileeo(?!\/(webm))|text)/)
+        (fileMime || mimetype).match(/^(image(?!\/(webp))|vfileeo(?!\/(webm))|text)/)
       )
         return this.send(useCompress.call(this, data));
 
@@ -71,7 +75,7 @@ function rawFileDecorator(fastify: FastifyInstance, _, done) {
         'Content-Length': size,
         'Accept-Ranges': 'bytes',
         'Content-Disposition': `${download ? 'attachment; ' : ''}filename="${encodeURIComponent(
-          file.originalName ?? file.name,
+          isThumb ? filename : file.originalName ?? filename,
         )}`,
       })
       .status(200)
@@ -116,6 +120,6 @@ export default fastifyPlugin(rawFileDecorator, {
 
 declare module 'fastify' {
   interface FastifyReply {
-    rawFile: (file: Partial<File>) => Promise<void>;
+    rawFile: (file: Partial<File> & { thumbnail: Partial<Thumbnail> }) => Promise<void>;
   }
 }

From ea6118f815357bb1acaf28ff31e4bb7b7cbec2ad Mon Sep 17 00:00:00 2001
From: Jay <gogojayvin923@gmail.com>
Date: Fri, 7 Feb 2025 16:41:44 -0800
Subject: [PATCH 15/24] ugh fiiine

---
 src/server/routes/raw.ts | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/server/routes/raw.ts b/src/server/routes/raw.ts
index cd6920b2b..fd4cd40e5 100644
--- a/src/server/routes/raw.ts
+++ b/src/server/routes/raw.ts
@@ -8,16 +8,10 @@ export default async function rawRoute(this: FastifyInstance, req: FastifyReques
 
   const file = await this.prisma.file.findFirst({
     where: {
-      OR: [{ name: id }, { invisible: { invis: decodeURI(encodeURI(id)) } }],
+      OR: [{ name: id }, { invisible: { invis: decodeURI(encodeURI(id)) } }, { thumbnail: { name: id } }],
     },
-    select: {
-      id: true,
-      name: true,
-      originalName: true,
-      mimetype: true,
-      password: true,
-      favorite: true,
-      expiresAt: true,
+    include: {
+      thumbnail: true,
     },
   });
 

From b9a8029deb2f4b9d599dd16edf87f0c8909b48a1 Mon Sep 17 00:00:00 2001
From: Jay <gogojayvin923@gmail.com>
Date: Fri, 7 Feb 2025 16:48:02 -0800
Subject: [PATCH 16/24] no more repeat thumbnail generations >:(

---
 src/server/index.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/server/index.ts b/src/server/index.ts
index 95a9d8c50..2bd1a01a2 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -241,7 +241,9 @@ async function thumbs(this: FastifyInstance) {
       mimetype: {
         startsWith: 'video/',
       },
-      thumbnail: null,
+      thumbnail: {
+        is: null,
+      },
     },
     include: {
       thumbnail: true,

From d26cdb4903a1a630d642bbf122e2afdfe5b31e94 Mon Sep 17 00:00:00 2001
From: Jay <gogojayvin923@gmail.com>
Date: Tue, 11 Feb 2025 00:10:51 -0800
Subject: [PATCH 17/24] bump fastify

---
 yarn.lock | 143 +++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 92 insertions(+), 51 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 35a13391e..f52caece1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -631,7 +631,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@fastify/error@npm:^3.4.0":
+"@fastify/error@npm:^3.3.0, @fastify/error@npm:^3.4.0":
   version: 3.4.1
   resolution: "@fastify/error@npm:3.4.1"
   checksum: 2c2e98c33327884c0927a73e8c3b8f162acbf1e4d058bacb68bca0c3607f36d6fde8c376fde45b2097e724d450266f8bb29134305fa24aabd200f83f087c7321
@@ -2544,13 +2544,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"archy@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "archy@npm:1.0.0"
-  checksum: 504ae7af655130bab9f471343cfdb054feaec7d8e300e13348bc9fe9e660f83d422e473069584f73233c701ae37d1c8452ff2522f2a20c38849e0f406f1732ac
-  languageName: node
-  linkType: hard
-
 "are-we-there-yet@npm:^2.0.0":
   version: 2.0.0
   resolution: "are-we-there-yet@npm:2.0.0"
@@ -2757,14 +2750,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"avvio@npm:^8.2.1":
-  version: 8.2.1
-  resolution: "avvio@npm:8.2.1"
+"avvio@npm:^8.3.0":
+  version: 8.4.0
+  resolution: "avvio@npm:8.4.0"
   dependencies:
-    archy: ^1.0.0
-    debug: ^4.0.0
-    fastq: ^1.6.1
-  checksum: 4c96922ea123d13b26cb78a071a8989fde62ee8580352b6d2f05b7976ed3d23efa663c12ee1be35501dfe65e12a769a2ea522bcdb7ca35a5ba4d86766467075a
+    "@fastify/error": ^3.3.0
+    fastq: ^1.17.1
+  checksum: 2a7fe42c41691408155752e1a3dcc52d8f1c157476869d05c0a902c73f839cebb7dea93b6bd4833d9b4c4d61d63f080517d8ce159aa5a564eba763491446489d
   languageName: node
   linkType: hard
 
@@ -4823,30 +4815,39 @@ __metadata:
   linkType: hard
 
 "fastify@npm:^4.24.3":
-  version: 4.24.3
-  resolution: "fastify@npm:4.24.3"
+  version: 4.29.0
+  resolution: "fastify@npm:4.29.0"
   dependencies:
     "@fastify/ajv-compiler": ^3.5.0
     "@fastify/error": ^3.4.0
     "@fastify/fast-json-stringify-compiler": ^4.3.0
     abstract-logging: ^2.0.1
-    avvio: ^8.2.1
+    avvio: ^8.3.0
     fast-content-type-parse: ^1.1.0
     fast-json-stringify: ^5.8.0
-    find-my-way: ^7.7.0
+    find-my-way: ^8.0.0
     light-my-request: ^5.11.0
-    pino: ^8.16.0
-    process-warning: ^2.2.0
+    pino: ^9.0.0
+    process-warning: ^3.0.0
     proxy-addr: ^2.0.7
     rfdc: ^1.3.0
     secure-json-parse: ^2.7.0
     semver: ^7.5.4
     toad-cache: ^3.3.0
-  checksum: f953c42aa47a22e69e0f721f4d82a17278dc66c317c0881b04e982cfc738c71bcccd1bcc951e317eb9600cec90840404aa1a04018a5fff909c412950ddf58956
+  checksum: d4f6fa4216b4671d8b6c2e39abdfaa073fc16e1f00220ddcee874cdde0149b44a82acc786444e9d5b248fa4eadcff9179c01d92d3a52003df7d246b01f39ffc2
+  languageName: node
+  linkType: hard
+
+"fastq@npm:^1.17.1":
+  version: 1.19.0
+  resolution: "fastq@npm:1.19.0"
+  dependencies:
+    reusify: ^1.0.4
+  checksum: c9203c9e485f5d1c5243e8807b15054533338242af632817f8d65bed6e46488e5b27cea75dfc110cc4c029137381e4d650449428bc42cc8712180f27a6bace9f
   languageName: node
   linkType: hard
 
-"fastq@npm:^1.6.0, fastq@npm:^1.6.1":
+"fastq@npm:^1.6.0":
   version: 1.15.0
   resolution: "fastq@npm:1.15.0"
   dependencies:
@@ -4930,6 +4931,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"find-my-way@npm:^8.0.0":
+  version: 8.2.2
+  resolution: "find-my-way@npm:8.2.2"
+  dependencies:
+    fast-deep-equal: ^3.1.3
+    fast-querystring: ^1.0.0
+    safe-regex2: ^3.1.0
+  checksum: bba4feafece3ef012180e561d904ead38e1f2e089bd97dbcb2c628d38cb869918626c673b08b698d22ef46265a886aa535a650574801ecab9c8eb8db5437736a
+  languageName: node
+  linkType: hard
+
 "find-root@npm:^1.1.0":
   version: 1.1.0
   resolution: "find-root@npm:1.1.0"
@@ -8747,41 +8759,40 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pino-abstract-transport@npm:v1.1.0":
-  version: 1.1.0
-  resolution: "pino-abstract-transport@npm:1.1.0"
+"pino-abstract-transport@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "pino-abstract-transport@npm:2.0.0"
   dependencies:
-    readable-stream: ^4.0.0
     split2: ^4.0.0
-  checksum: cc84caabee5647b5753ae484d5f63a1bca0f6e1791845e2db2b6d830a561c2b5dd1177720f68d78994c8a93aecc69f2729e6ac2bc871a1bf5bb4b0ec17210668
+  checksum: 4db0cd8a1a7b6d13e76dbb58e6adc057c39e4591c70f601f4a427c030d57dff748ab53954e1ecd3aa6e21c1a22dd38de96432606c6d906a7b9f610543bf1d6e2
   languageName: node
   linkType: hard
 
-"pino-std-serializers@npm:^6.0.0":
-  version: 6.2.2
-  resolution: "pino-std-serializers@npm:6.2.2"
-  checksum: aeb0662edc46ec926de9961ed4780a4f0586bb7c37d212cd469c069639e7816887a62c5093bc93f260a4e0900322f44fc8ab1343b5a9fa2864a888acccdb22a4
+"pino-std-serializers@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "pino-std-serializers@npm:7.0.0"
+  checksum: 08cd1d7b7adc4cfca39e42c2d5fd21bcf4513153734e7b8fa278b0e9e9f62df78c4c202886343fe882a462539c931cb8110b661775ad7f7217c96856795b5a86
   languageName: node
   linkType: hard
 
-"pino@npm:^8.16.0":
-  version: 8.16.1
-  resolution: "pino@npm:8.16.1"
+"pino@npm:^9.0.0":
+  version: 9.6.0
+  resolution: "pino@npm:9.6.0"
   dependencies:
     atomic-sleep: ^1.0.0
     fast-redact: ^3.1.1
     on-exit-leak-free: ^2.1.0
-    pino-abstract-transport: v1.1.0
-    pino-std-serializers: ^6.0.0
-    process-warning: ^2.0.0
+    pino-abstract-transport: ^2.0.0
+    pino-std-serializers: ^7.0.0
+    process-warning: ^4.0.0
     quick-format-unescaped: ^4.0.3
     real-require: ^0.2.0
     safe-stable-stringify: ^2.3.1
-    sonic-boom: ^3.7.0
-    thread-stream: ^2.0.0
+    sonic-boom: ^4.0.1
+    thread-stream: ^3.0.0
   bin:
     pino: bin.js
-  checksum: a52730479e526de7fbfb7bed492a365da0dfabaacc71fc9b67831b413f8d6948c7f984a385e47483c58099872d7e1a2c630c882eeccb6e237215540a96f61787
+  checksum: ccecc1a1264dd222192d89954f22eb308ae4df4f1124e23c83758a1464933c91670fbe5e20496538ec23c430f135dd9868688309c9bf952b77f68b3adc3fc45f
   languageName: node
   linkType: hard
 
@@ -8964,13 +8975,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"process-warning@npm:^2.0.0, process-warning@npm:^2.2.0":
+"process-warning@npm:^2.0.0":
   version: 2.3.0
   resolution: "process-warning@npm:2.3.0"
   checksum: ee795f7fba5b289a3c15a9dfcde40c277efe75ac1ad63f9fb7851d3eb08d1939c67e310dc7ca2cc914f8293e2517cd60839e19d1c130f908b06c970a51a0d2a7
   languageName: node
   linkType: hard
 
+"process-warning@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "process-warning@npm:3.0.0"
+  checksum: 1fc2eb4524041de3c18423334cc8b4e36bec5ad5472640ca1a936122c6e01da0864c1a4025858ef89aea93eabe7e77db93ccea225b10858617821cb6a8719efe
+  languageName: node
+  linkType: hard
+
+"process-warning@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "process-warning@npm:4.0.1"
+  checksum: b5dca75a0b200c6d1ccd7a7ee552c627f9f40a91f3848ce5dda037ba8cf4f947a6066f4ec7a9f482817953bd018298c79a0f10507be6836090bcf69ad3061df1
+  languageName: node
+  linkType: hard
+
 "process@npm:^0.11.10":
   version: 0.11.10
   resolution: "process@npm:0.11.10"
@@ -9368,7 +9393,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"readable-stream@npm:^4.0.0, readable-stream@npm:^4.2.0":
+"readable-stream@npm:^4.2.0":
   version: 4.4.2
   resolution: "readable-stream@npm:4.4.2"
   dependencies:
@@ -9673,6 +9698,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ret@npm:~0.4.0":
+  version: 0.4.3
+  resolution: "ret@npm:0.4.3"
+  checksum: 621c73c86db7537d91a2c47f602c7db71e11cd6f131fedb24aa2818b4d35a23377e0bc22bfa6f12295706d5b06035cf6e8d92fbd75f8f37d73b65e188b7f3fa9
+  languageName: node
+  linkType: hard
+
 "retry@npm:^0.12.0":
   version: 0.12.0
   resolution: "retry@npm:0.12.0"
@@ -9835,6 +9867,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"safe-regex2@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "safe-regex2@npm:3.1.0"
+  dependencies:
+    ret: ~0.4.0
+  checksum: 4f9f7172662763619052a45599e515efc5dd10a932690f610c8ab808a4baa41be3feafefa444f7532651d721d12871a1c9a85330626cdd013b804e8f4240dff1
+  languageName: node
+  linkType: hard
+
 "safe-stable-stringify@npm:^2.3.1":
   version: 2.4.3
   resolution: "safe-stable-stringify@npm:2.4.3"
@@ -10117,12 +10158,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sonic-boom@npm:^3.7.0":
-  version: 3.7.0
-  resolution: "sonic-boom@npm:3.7.0"
+"sonic-boom@npm:^4.0.1":
+  version: 4.2.0
+  resolution: "sonic-boom@npm:4.2.0"
   dependencies:
     atomic-sleep: ^1.0.0
-  checksum: 528f0f7f7e09dcdb02ad5985039f66554266cbd8813f9920781607c9248e01f468598c1334eab2cc740c016a63c8b2a20e15c3f618cddb08ea1cfb4a390a796e
+  checksum: e5e1ffdd3bcb0dee3bf6f7b2ff50dd3ffa2df864dc9d53463f33e225021a28601e91d0ec7e932739824bafd6f4ff3b7090939ac3e34ab1022e01692b41f7e8a3
   languageName: node
   linkType: hard
 
@@ -10714,12 +10755,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"thread-stream@npm:^2.0.0":
-  version: 2.4.1
-  resolution: "thread-stream@npm:2.4.1"
+"thread-stream@npm:^3.0.0":
+  version: 3.1.0
+  resolution: "thread-stream@npm:3.1.0"
   dependencies:
     real-require: ^0.2.0
-  checksum: 8b28e11eab2f805f963e6b6b23afab5523079575c4fc79c16eb29aa1c13d7931289762ebbc1268b3373d3f35ce795bd291df8e2d51eb45779ecaaecd06873459
+  checksum: 3c5b494ce776f832dfd696792cc865f78c1e850db93e07979349bbc1a5845857cd447aea95808892906cc0178a2fd3233907329f3376e7fc9951e2833f5b7896
   languageName: node
   linkType: hard
 

From ad2ba1818908b5a53994c3db8fa957e5b6dc2b88 Mon Sep 17 00:00:00 2001
From: Jay <gogojayvin923@gmail.com>
Date: Tue, 11 Feb 2025 00:13:30 -0800
Subject: [PATCH 18/24] pass queries too

---
 src/server/routes/uploads.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/server/routes/uploads.ts b/src/server/routes/uploads.ts
index 42713edbd..176eb2dd8 100644
--- a/src/server/routes/uploads.ts
+++ b/src/server/routes/uploads.ts
@@ -17,7 +17,8 @@ export default async function uploadsRoute(this: FastifyInstance, req: FastifyRe
   const failed = await reply.preFile(file);
   if (failed) return reply.notFound();
 
-  return this.nextServer.render(req.raw, reply.raw, `/view/${file.name}`);
+  // @ts-ignore
+  return this.nextServer.render(req.raw, reply.raw, `/view/${file.name}`, req.query);
 }
 
 export async function uploadsRouteOnResponse(

From 9c4bb027699eaa6b3b4d4e9b9da1b238edb80149 Mon Sep 17 00:00:00 2001
From: Jay <gogojayvin923@gmail.com>
Date: Tue, 11 Feb 2025 00:13:45 -0800
Subject: [PATCH 19/24] add thumbnail for type

---
 src/server/decorators/rawFile.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server/decorators/rawFile.ts b/src/server/decorators/rawFile.ts
index e90a8c446..cc92813dd 100644
--- a/src/server/decorators/rawFile.ts
+++ b/src/server/decorators/rawFile.ts
@@ -12,7 +12,7 @@ function rawFileDecorator(fastify: FastifyInstance, _, done) {
   fastify.decorateReply('rawFile', rawFile);
   done();
 
-  async function rawFile(this: FastifyReply, file: Partial<File> & { thumbnail: Partial<Thumbnail> }) {
+  async function rawFile(this: FastifyReply, file: Partial<File> & { thumbnail?: Partial<Thumbnail> }) {
     const { download, compress = 'false' } = this.request.query as { download?: string; compress?: string };
     const isThumb = (this.request.params['id'] as string) === file.thumbnail?.name,
       filename = isThumb ? file.thumbnail?.name : file.name,
@@ -120,6 +120,6 @@ export default fastifyPlugin(rawFileDecorator, {
 
 declare module 'fastify' {
   interface FastifyReply {
-    rawFile: (file: Partial<File> & { thumbnail: Partial<Thumbnail> }) => Promise<void>;
+    rawFile: (file: Partial<File> & { thumbnail?: Partial<Thumbnail> }) => Promise<void>;
   }
 }

From 233324b6c58814188b0ce369f931cd8e14230ab6 Mon Sep 17 00:00:00 2001
From: Jay <gogojayvin923@gmail.com>
Date: Tue, 11 Feb 2025 18:36:49 -0800
Subject: [PATCH 20/24] notFeat: Don't expect much from this added route, I
 won't add more than essential.

---
 src/pages/api/oembed/[id].tsx | 75 +++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 src/pages/api/oembed/[id].tsx

diff --git a/src/pages/api/oembed/[id].tsx b/src/pages/api/oembed/[id].tsx
new file mode 100644
index 000000000..a2081713a
--- /dev/null
+++ b/src/pages/api/oembed/[id].tsx
@@ -0,0 +1,75 @@
+import { NextApiReq, NextApiRes, withZipline } from 'middleware/withZipline';
+import 'lib/prisma';
+import 'lib/config';
+
+async function handler(req: NextApiReq, res: NextApiRes) {
+  const { id } = req.query as { id: string };
+  if (req.method === 'GET') {
+    if (!id || isNaN(parseInt(id))) return res.badRequest('no id');
+
+    const file = await prisma.file.findUnique({
+      where: {
+        id: parseInt(id),
+      },
+      include: {
+        thumbnail: {
+          select: {
+            name: true,
+          },
+        },
+        user: {
+          select: {
+            username: true,
+          },
+        },
+      },
+    });
+    if (!file || !!file.password) return res.notFound('no such file exists');
+
+    const mediaType: 'image' | 'video' | 'audio' | 'other' =
+      (new RegExp(/^(?<type>image|video|audio)/).exec(file.mimetype)?.groups?.type as
+        | 'image'
+        | 'video'
+        | 'audio') || 'other';
+
+    let host = req.headers.host;
+    const proto = req.headers['x-forwarded-proto'];
+    try {
+      if (
+        JSON.parse(req.headers['cf-visitor'] as string).scheme === 'https' ||
+        proto === 'https' ||
+        config.core.return_https
+      )
+        host = `https://${host}`;
+      else host = `http://${host}`;
+    } catch (e) {
+      if (proto === 'https' || config.core.return_https) host = `https://${host}`;
+      else host = `http://${host}`;
+    }
+
+    if (mediaType === 'image')
+      return res.json({
+        type: 'photo',
+        version: '1.0',
+        url: `${host}/r/${file.name}`,
+      });
+    if (mediaType === 'video')
+      return res.json({
+        type: 'video',
+        version: '1.0',
+        url: `${host}/r/${file.name}`,
+        thumbnail_url: file.thumbnail ? `${host}/r/${file.thumbnail.name}` : undefined,
+        html: `<video src="${host}/r/${file.name}"/>`,
+      });
+    return res.json({
+      type: 'link',
+      version: '1.0',
+      url: `${host}${config.uploader.route}/${file.name}`,
+    });
+  }
+}
+
+export default withZipline(handler, {
+  methods: ['GET'],
+  user: false,
+});

From c8b340cedf2ec678bdd5b9d193b52e355234e9b2 Mon Sep 17 00:00:00 2001
From: Jay <gogojayvin923@gmail.com>
Date: Tue, 11 Feb 2025 18:39:04 -0800
Subject: [PATCH 21/24] fix: my own mistake of breaking embeds with sites.
 Images should have their links hidden with discord. Videos can embed and
 play. Others? Good luck

---
 src/pages/view/[id].tsx | 315 ++++++++++++++++++++++++++++------------
 1 file changed, 222 insertions(+), 93 deletions(-)

diff --git a/src/pages/view/[id].tsx b/src/pages/view/[id].tsx
index edf097ec0..d9ea70515 100644
--- a/src/pages/view/[id].tsx
+++ b/src/pages/view/[id].tsx
@@ -17,43 +17,52 @@ export default function EmbeddedFile({
   user,
   prismRender,
   host,
-  compress,
+  mediaType,
 }: {
-  file: Omit<Partial<File>, 'password'> & {
+  file: Omit<File, 'password'> & {
     password: boolean;
-    imageProps?: HTMLImageElement;
-    thumbnail: Thumbnail;
+    mediaProps?: {
+      width: number;
+      height: number;
+    };
+    thumbnail?: Pick<Thumbnail, 'name'>;
   };
   user: UserExtended;
   prismRender: boolean;
   host: string;
-  compress?: boolean;
+  mediaType: 'image' | 'video' | 'audio' | 'other';
 }) {
-  const dataURL = (route: string, pass?: string) =>
-    `${route}/${encodeURIComponent(file.name)}?compress=${compress ?? false}${
-      pass ? `&password=${encodeURIComponent(pass)}` : ''
-    }`;
-
   const router = useRouter();
+  const {
+    password: provPassword,
+    compress,
+    embed,
+  } = router.query as {
+    password?: string;
+    compress?: string;
+    embed?: string;
+  };
+  const dataURL = (route: string, opts?: { withHost?: boolean; useThumb?: boolean; pass?: string }) =>
+    `${opts?.withHost ? host : ''}${route}/${encodeURIComponent(
+      (opts?.useThumb && !!file.thumbnail && file.thumbnail.name) || file.name,
+    )}?compress=${compress ?? false}${opts?.pass ? `&password=${encodeURIComponent(opts?.pass)}` : ''}`;
   const [opened, setOpened] = useState(file.password);
-  const [password, setPassword] = useState('');
+  const [password, setPassword] = useState(provPassword || '');
   const [error, setError] = useState('');
   const [scale, setScale] = useState(2);
 
   const [downloadWPass, setDownloadWPass] = useState(false);
 
-  const mimeMatch = new RegExp(/^((?<img>image)|(?<vid>video)|(?<aud>audio))/).exec(file.mimetype);
-
   // reapply date from workaround
   file.createdAt = new Date(file ? file.createdAt : 0);
 
   const check = async () => {
-    const res = await fetch(dataURL('/r', password));
+    const res = await fetch(dataURL('/r', { pass: password }));
 
     if (res.ok) {
       setError('');
-      if (prismRender) return router.push(`/code/${file.name}?password=${password}`);
-      updateFile(dataURL('/r', password));
+      if (prismRender) return router.push(`/code/${file.name}?password=${encodeURIComponent(password)}`);
+      updateMedia(dataURL('/r', { pass: password }));
       setOpened(false);
       setDownloadWPass(true);
     } else {
@@ -61,107 +70,219 @@ export default function EmbeddedFile({
     }
   };
 
-  const updateFile = async (url?: string) => {
-    if (!mimeMatch) return;
-
-    const imageEl = document.getElementById('image_content') as HTMLImageElement,
-      videoEl = document.getElementById('video_content') as HTMLVideoElement,
-      audioEl = document.getElementById('audio_content') as HTMLAudioElement;
-
-    if (url) {
-      if (mimeMatch?.groups?.img) imageEl.src = url;
-      if (mimeMatch?.groups?.vid) videoEl.src = url;
-      if (mimeMatch?.groups?.aud) audioEl.src = url;
+  const updateMedia: (url?: string) => void = function (url?: string) {
+    if (mediaType === 'other') return;
+
+    const mediaContent = document.getElementById(`${mediaType}_content`) as
+      | HTMLImageElement
+      | HTMLVideoElement
+      | HTMLAudioElement;
+
+    if (mediaType === 'image') {
+      if (document.getElementsByClassName('dynamic').length !== 0) return;
+      const img = new Image();
+      img.onload = function () {
+        if (document.getElementsByClassName('dynamic').length !== 0) return;
+        file.mediaProps = {
+          width: img.naturalWidth,
+          height: img.naturalHeight,
+        };
+        const metas: HTMLMetaElement[] = [];
+        for (let i = 0; i !== 2; i++) {
+          const metaW = document.createElement('meta');
+          const metaH = document.createElement('meta');
+          metaW.setAttribute('name', i % 2 ? 'twitter:image:width' : 'og:image:width');
+          metaH.setAttribute('name', i % 2 ? 'twitter:image:height' : 'og:image:height');
+          metaW.setAttribute('content', file.mediaProps.width.toString());
+          metaH.setAttribute('content', file.mediaProps.width.toString());
+          metaW.className = 'dynamic';
+          metaH.className = 'dynamic';
+          metas.push(...[metaW, metaH]);
+        }
+        for (const meta of metas) document.head.appendChild(meta);
+        img.remove();
+      };
+      img.src = dataURL('/r', { pass: password.length !== 0 ? password : undefined });
+    }
+    if (mediaType === 'video') {
+      if (document.getElementsByClassName('dynamic').length !== 0) return;
+      const vid = document.createElement('video');
+      vid.onloadedmetadata = function () {
+        if (document.getElementsByClassName('dynamic').length !== 0) return;
+        file.mediaProps = {
+          width: vid.videoWidth,
+          height: vid.videoHeight,
+        };
+        const metas: HTMLMetaElement[] = [];
+        for (let i = 0; i !== 2; i++) {
+          const metaW = document.createElement('meta');
+          const metaH = document.createElement('meta');
+          metaW.setAttribute('name', i % 2 ? 'twitter:player:width' : 'og:video:width');
+          metaH.setAttribute('name', i % 2 ? 'twitter:player:height' : 'og:video:height');
+          metaW.setAttribute('content', file.mediaProps.width.toString());
+          metaH.setAttribute('content', file.mediaProps.width.toString());
+          metaW.className = 'dynamic';
+          metaH.className = 'dynamic';
+          metas.push(...[metaW, metaH]);
+        }
+        for (const meta of metas) document.head.appendChild(meta);
+        vid.remove();
+      };
+      vid.src = dataURL('/r', { pass: password.length !== 0 ? password : undefined });
+      vid.load();
     }
+    if (url) mediaContent.src = url;
   };
 
   useEffect(() => {
     if (file.password) {
-      setOpened(true);
+      if (password) check();
+      else setOpened(true);
     }
-  }, []);
-
-  useEffect(() => {
-    if (!mimeMatch) return;
 
-    updateFile();
+    if (mediaType === 'other') return;
+    updateMedia();
+    return () => {
+      const metas = document.head.getElementsByClassName('dynamic');
+      for (const meta of metas) meta.remove();
+    };
   }, []);
 
   return (
     <>
       <Head>
+        <meta
+          property='og:url'
+          content={dataURL(router.asPath.replace(('/' + router.query['id']) as string, ''), {
+            withHost: true,
+          })}
+        />
+        {!embed && !file.embed && mediaType === 'image' && (
+          <link rel='alternate' type='application/json+oembed' href={`${host}/api/oembed/${file.id}`} />
+        )}
         {user.embed.title && file.embed && (
           <meta property='og:title' content={parseString(user.embed.title, { file: file, user })} />
         )}
-
         {user.embed.description && file.embed && (
           <meta
             property='og:description'
             content={parseString(user.embed.description, { file: file, user })}
           />
         )}
-
         {user.embed.siteName && file.embed && (
           <meta property='og:site_name' content={parseString(user.embed.siteName, { file: file, user })} />
         )}
-
         {user.embed.color && file.embed && (
           <meta property='theme-color' content={parseString(user.embed.color, { file: file, user })} />
         )}
-
-        {mimeMatch?.groups?.img && (
+        {embed?.toLowerCase() === 'true' && !file.embed && (
           <>
-            <meta property='og:type' content='image' />
-            <meta property='og:image' itemProp='image' content={`${host}/r/${file.name}`} />
-            <meta property='og:url' content={`${host}/r/${file.name}`} />
-            <meta property='og:image:width' content={file.imageProps?.naturalWidth.toString()} />
-            <meta property='og:image:height' content={file.imageProps?.naturalHeight.toString()} />
-            <meta property='twitter:card' content='summary_large_image' />
-            <meta property='twitter:image' content={`${host}/r/${file.name}`} />
+            <meta name='og:title' content={file.name} />
             <meta property='twitter:title' content={file.name} />
+            {mediaType === 'image' && (
+              <meta
+                name='twitter:image'
+                content={dataURL('/r', { withHost: true, pass: password.length == 0 ? undefined : password })}
+              />
+            )}
+            {mediaType === 'image' && <meta property='twitter:card' content='summary_large_image' />}
           </>
         )}
-        {mimeMatch?.groups?.vid && (
+        {mediaType === 'image' && (
           <>
-            <meta name='twitter:card' content='player' />
-            <meta name='twitter:player' content={`${host}/r/${file.name}`} />
-            <meta name='twitter:player:stream' content={`${host}/r/${file.name}`} />
-            <meta name='twitter:player:stream:content_type' content={file.mimetype} />
-            <meta name='twitter:title' content={file.name} />
-
-            {file.thumbnail && (
-              <>
-                <meta name='twitter:image' content={`${host}/r/${file.thumbnail.name}`} />
-                <meta property='og:image' content={`${host}/r/${file.thumbnail.name}`} />
-              </>
-            )}
-
-            <meta property='og:type' content={'video.other'} />
-            <meta property='og:url' content={`${host}/r/${file.name}`} />
-            <meta property='og:video' content={`${host}/r/${file.name}`} />
-            <meta property='og:video:url' content={`${host}/r/${file.name}`} />
-            <meta property='og:video:secure_url' content={`${host}/r/${file.name}`} />
-            <meta property='og:video:type' content={file.mimetype} />
+            <meta
+              property='og:image'
+              itemProp='image'
+              content={dataURL('/r', { withHost: true, pass: password.length == 0 ? undefined : password })}
+            />
+            <meta
+              property='og:image:secure_url'
+              content={dataURL('/r', {
+                withHost: true,
+                useThumb: true,
+                pass: password.length == 0 ? undefined : password,
+              })}
+            />
+            <meta property='og:image:alt' content={file.name} />
+            <meta property='og:image:type' content={file.mimetype} />
           </>
         )}
-        {mimeMatch?.groups?.aud && (
+        {mediaType === 'video' && [
+          ...(!!file.thumbnail
+            ? [
+                <meta
+                  property='og:image:url'
+                  key='og:image:url'
+                  content={dataURL('/r', {
+                    withHost: true,
+                    useThumb: true,
+                    pass: password.length == 0 ? undefined : password,
+                  })}
+                />,
+                <meta
+                  property='og:image:secure_url'
+                  key='og:image:secure_url'
+                  content={dataURL('/r', {
+                    withHost: true,
+                    useThumb: true,
+                    pass: password.length == 0 ? undefined : password,
+                  })}
+                />,
+                <meta property='og:image:type' key='og:image:type' content='image/jpeg' />,
+                <meta
+                  name='twitter:image'
+                  key='twitter:image'
+                  content={dataURL('/r', {
+                    withHost: true,
+                    useThumb: true,
+                    pass: password.length == 0 ? undefined : password,
+                  })}
+                />,
+              ]
+            : []),
+          <meta name='twitter:card' key='twitter:card' content='player' />,
+          <meta
+            name='twitter:player'
+            key='twitter:player'
+            content={dataURL('/r', { withHost: true, pass: password.length == 0 ? undefined : password })}
+          />,
+          <meta
+            name='twitter:player:stream'
+            key='twitter:player:stream'
+            content={dataURL('/r', { withHost: true, pass: password.length == 0 ? undefined : password })}
+          />,
+          <meta
+            name='twitter:player:stream:content_type'
+            key='twitter:player:stream:content_type'
+            content={file.mimetype}
+          />,
+          <meta property='og:type' key='og:type' content='video.movie' />,
+          <meta
+            property='og:video'
+            key='og:video'
+            content={dataURL('/r', { withHost: true, pass: password.length == 0 ? undefined : password })}
+          />,
+          <meta
+            property='og:video:secure_url'
+            key='og:video:secure_url'
+            content={dataURL('/r', { withHost: true, pass: password.length == 0 ? undefined : password })}
+          />,
+          <meta property='og:video:type' key='og:video:type' content={file.mimetype} />,
+        ]}
+        {mediaType === 'audio' && (
           <>
-            <meta name='twitter:card' content='player' />
-            <meta name='twitter:player' content={`${host}/r/${file.name}`} />
-            <meta name='twitter:player:stream' content={`${host}/r/${file.name}`} />
-            <meta name='twitter:player:stream:content_type' content={file.mimetype} />
-            <meta name='twitter:title' content={file.name} />
-            <meta name='twitter:player:width' content='720' />
-            <meta name='twitter:player:height' content='480' />
-
             <meta property='og:type' content='music.song' />
-            <meta property='og:url' content={`${host}/r/${file.name}`} />
-            <meta property='og:audio' content={`${host}/r/${file.name}`} />
-            <meta property='og:audio:secure_url' content={`${host}/r/${file.name}`} />
+            <meta
+              property='og:audio'
+              content={dataURL('/r', { withHost: true, pass: password.length == 0 ? undefined : password })}
+            />
+            <meta
+              property='og:audio:secure_url'
+              content={dataURL('/r', { withHost: true, pass: password.length == 0 ? undefined : password })}
+            />
             <meta property='og:audio:type' content={file.mimetype} />
           </>
         )}
-        {!mimeMatch && <meta property='og:url' content={`${host}/r/${file.name}`} />}
         <title>{file.name}</title>
       </Head>
       <Modal
@@ -192,7 +313,7 @@ export default function EmbeddedFile({
           overflow: 'hidden',
         }}
         onMouseDown={(e) => {
-          if (!mimeMatch?.groups?.img || e.button !== 0) return;
+          if (mediaType !== 'image' || e.button !== 0) return;
           if (e.button !== 0) return;
 
           e.preventDefault();
@@ -206,7 +327,7 @@ export default function EmbeddedFile({
           return true;
         }}
         onMouseUp={(e) => {
-          if (!mimeMatch?.groups?.img || e.button !== 0) return;
+          if (mediaType !== 'image' || e.button !== 0) return;
 
           const imageEl = document.getElementById('image_content') as HTMLImageElement;
           if (!imageEl.style.transform.startsWith('translate')) return;
@@ -215,7 +336,7 @@ export default function EmbeddedFile({
           return true;
         }}
         onMouseMove={(e) => {
-          if (!mimeMatch?.groups?.img || e.button !== 0) return;
+          if (mediaType !== 'image' || e.button !== 0) return;
           if (e.button !== 0) return;
 
           const imageEl = document.getElementById('image_content') as HTMLImageElement,
@@ -227,7 +348,7 @@ export default function EmbeddedFile({
           return true;
         }}
         onWheel={(e) => {
-          if (!mimeMatch?.groups?.img || e.button !== 0) return;
+          if (mediaType !== 'image' || e.button !== 0) return;
 
           const imageEl = document.getElementById('image_content') as HTMLImageElement,
             posX = e.pageX - (imageEl.x + imageEl.width / 2),
@@ -242,7 +363,7 @@ export default function EmbeddedFile({
           }px) scale(${newScale})`;
         }}
       >
-        {mimeMatch?.groups?.img && (
+        {mediaType === 'image' && (
           <img
             src={dataURL('/r')}
             alt={dataURL('/r')}
@@ -251,11 +372,12 @@ export default function EmbeddedFile({
               transition: 'transform 0.25s ease',
               maxHeight: '100vh',
               maxWidth: '100vw',
+              objectFit: 'contain',
             }}
           />
         )}
 
-        {mimeMatch?.groups?.vid && (
+        {mediaType === 'video' && (
           <video
             style={{
               maxHeight: '100vh',
@@ -269,10 +391,10 @@ export default function EmbeddedFile({
           />
         )}
 
-        {mimeMatch?.groups?.aud && <audio src={dataURL('/r')} controls autoPlay muted id='audio_content' />}
+        {mediaType === 'audio' && <audio src={dataURL('/r')} controls autoPlay muted id='audio_content' />}
 
-        {!mimeMatch && (
-          <AnchorNext component={Link} href={dataURL('/r', downloadWPass ? password : undefined)}>
+        {mediaType === 'other' && (
+          <AnchorNext component={Link} href={dataURL('/r', { pass: downloadWPass ? password : undefined })}>
             Can&#39;t preview this file. Click here to download it.
           </AnchorNext>
         )}
@@ -283,22 +405,23 @@ export default function EmbeddedFile({
 
 export const getServerSideProps: GetServerSideProps = async (context) => {
   const { id } = context.params as { id: string };
-  const { compress = null } = context.query as {
-    compress?: string;
-  };
   const file = await prisma.file.findFirst({
     where: {
       OR: [{ name: id }, { invisible: { invis: decodeURI(encodeURI(id)) } }],
     },
     include: {
-      thumbnail: true,
+      thumbnail: {
+        select: {
+          name: true,
+        },
+      },
     },
   });
   let host = context.req.headers.host;
   if (!file) return { notFound: true };
 
   // @ts-ignore
-  file.size = Number(file.size);
+  file.size = parseInt(file.size);
 
   const proto = context.req.headers['x-forwarded-proto'];
   try {
@@ -314,6 +437,12 @@ export const getServerSideProps: GetServerSideProps = async (context) => {
     else host = `http://${host}`;
   }
 
+  const mediaType: 'image' | 'video' | 'audio' | 'other' =
+    (new RegExp(/^(?<type>image|video|audio)/).exec(file.mimetype)?.groups?.type as
+      | 'image'
+      | 'video'
+      | 'audio') || 'other';
+
   const user = await prisma.user.findFirst({
     where: {
       id: file.userId,
@@ -354,7 +483,7 @@ export const getServerSideProps: GetServerSideProps = async (context) => {
       file,
       user,
       host,
-      compress,
+      mediaType,
     },
   };
 };

From b83ca16053af4b712be39bf71e439eb318104624 Mon Sep 17 00:00:00 2001
From: Jay <gogojayvin923@gmail.com>
Date: Tue, 11 Feb 2025 18:42:26 -0800
Subject: [PATCH 22/24] fix: any edge case where thumbnail don't exist

---
 src/pages/api/oembed/[id].tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/api/oembed/[id].tsx b/src/pages/api/oembed/[id].tsx
index a2081713a..c0155b5d0 100644
--- a/src/pages/api/oembed/[id].tsx
+++ b/src/pages/api/oembed/[id].tsx
@@ -58,7 +58,7 @@ async function handler(req: NextApiReq, res: NextApiRes) {
         type: 'video',
         version: '1.0',
         url: `${host}/r/${file.name}`,
-        thumbnail_url: file.thumbnail ? `${host}/r/${file.thumbnail.name}` : undefined,
+        thumbnail_url: file.thumbnail ? `${host}/r/${file.thumbnail?.name}` : undefined,
         html: `<video src="${host}/r/${file.name}"/>`,
       });
     return res.json({

From 66da8b8f52eca7c6693ec799cd3ad2f1b3522e73 Mon Sep 17 00:00:00 2001
From: Jay <gogojayvin923@gmail.com>
Date: Tue, 11 Feb 2025 21:04:34 -0800
Subject: [PATCH 23/24] fix??: I unno, discord hasn't embedded without the link
 showing but maybe other places could

---
 src/pages/api/oembed/[id].tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/api/oembed/[id].tsx b/src/pages/api/oembed/[id].tsx
index c0155b5d0..952f55a78 100644
--- a/src/pages/api/oembed/[id].tsx
+++ b/src/pages/api/oembed/[id].tsx
@@ -59,7 +59,7 @@ async function handler(req: NextApiReq, res: NextApiRes) {
         version: '1.0',
         url: `${host}/r/${file.name}`,
         thumbnail_url: file.thumbnail ? `${host}/r/${file.thumbnail?.name}` : undefined,
-        html: `<video src="${host}/r/${file.name}"/>`,
+        html: `<video><source src="${host}/r/${file.name}" type="${file.mimetype}"/></video>`,
       });
     return res.json({
       type: 'link',

From 201d4b612ce495ed2ecbcc890bb987d3afca3e29 Mon Sep 17 00:00:00 2001
From: Jay <gogojayvin923@gmail.com>
Date: Tue, 11 Feb 2025 21:07:02 -0800
Subject: [PATCH 24/24] chore: some trimming that I could

---
 src/pages/view/[id].tsx | 201 ++++++++++++++++------------------------
 1 file changed, 80 insertions(+), 121 deletions(-)

diff --git a/src/pages/view/[id].tsx b/src/pages/view/[id].tsx
index d9ea70515..fff48d771 100644
--- a/src/pages/view/[id].tsx
+++ b/src/pages/view/[id].tsx
@@ -42,29 +42,29 @@ export default function EmbeddedFile({
     compress?: string;
     embed?: string;
   };
-  const dataURL = (route: string, opts?: { withHost?: boolean; useThumb?: boolean; pass?: string }) =>
-    `${opts?.withHost ? host : ''}${route}/${encodeURIComponent(
-      (opts?.useThumb && !!file.thumbnail && file.thumbnail.name) || file.name,
-    )}?compress=${compress ?? false}${opts?.pass ? `&password=${encodeURIComponent(opts?.pass)}` : ''}`;
+
+  const dataURL = (route: string, useThumb?: boolean, withoutHost?: boolean, pass?: string) =>
+    `${withoutHost ? '' : host}${route}/${encodeURIComponent(
+      (useThumb && !!file.thumbnail && file.thumbnail.name) || file.name,
+    )}?compress=${compress?.toLowerCase() === 'true' || false}${
+      !!pass ? `&password=${encodeURIComponent(pass)}` : ''
+    }`;
   const [opened, setOpened] = useState(file.password);
   const [password, setPassword] = useState(provPassword || '');
   const [error, setError] = useState('');
   const [scale, setScale] = useState(2);
 
-  const [downloadWPass, setDownloadWPass] = useState(false);
-
   // reapply date from workaround
   file.createdAt = new Date(file ? file.createdAt : 0);
 
   const check = async () => {
-    const res = await fetch(dataURL('/r', { pass: password }));
+    const res = await fetch(dataURL('/r'));
 
     if (res.ok) {
       setError('');
       if (prismRender) return router.push(`/code/${file.name}?password=${encodeURIComponent(password)}`);
-      updateMedia(dataURL('/r', { pass: password }));
+      updateMedia(dataURL('/r', false, true, password));
       setOpened(false);
-      setDownloadWPass(true);
     } else {
       setError('Invalid password');
     }
@@ -78,59 +78,58 @@ export default function EmbeddedFile({
       | HTMLVideoElement
       | HTMLAudioElement;
 
-    if (mediaType === 'image') {
-      if (document.getElementsByClassName('dynamic').length !== 0) return;
-      const img = new Image();
-      img.onload = function () {
-        if (document.getElementsByClassName('dynamic').length !== 0) return;
-        file.mediaProps = {
-          width: img.naturalWidth,
-          height: img.naturalHeight,
+    if (document.head.getElementsByClassName('dynamic').length === 0) {
+      const metas: HTMLMetaElement[][] = [];
+      const twType = mediaType === 'video' ? 'player' : 'image';
+      const ogType = mediaType === 'video' ? 'video' : 'image';
+      for (let i = 0; i !== 2; i++) {
+        const metaW = document.createElement('meta');
+        const metaH = document.createElement('meta');
+        metaW.setAttribute('name', i % 2 ? `twitter:${twType}:width` : `og:${ogType}:width`);
+        metaH.setAttribute('name', i % 2 ? `twitter:${twType}:height` : `og:${ogType}:height`);
+        metaW.className = 'dynamic';
+        metaH.className = 'dynamic';
+        metas.push([metaW, metaH]);
+      }
+      if (mediaType === 'image') {
+        const img = new Image();
+        img.onload = function () {
+          if (document.head.getElementsByClassName('dynamic').length !== 0) return;
+          file.mediaProps = {
+            width: img.naturalWidth,
+            height: img.naturalHeight,
+          };
+          for (const meta of metas) {
+            meta[0].setAttribute('content', file.mediaProps.width.toString());
+            meta[1].setAttribute('content', file.mediaProps.height.toString());
+            document.head.appendChild(meta[0]);
+            document.head.appendChild(meta[1]);
+          }
+          img.remove();
         };
-        const metas: HTMLMetaElement[] = [];
-        for (let i = 0; i !== 2; i++) {
-          const metaW = document.createElement('meta');
-          const metaH = document.createElement('meta');
-          metaW.setAttribute('name', i % 2 ? 'twitter:image:width' : 'og:image:width');
-          metaH.setAttribute('name', i % 2 ? 'twitter:image:height' : 'og:image:height');
-          metaW.setAttribute('content', file.mediaProps.width.toString());
-          metaH.setAttribute('content', file.mediaProps.width.toString());
-          metaW.className = 'dynamic';
-          metaH.className = 'dynamic';
-          metas.push(...[metaW, metaH]);
-        }
-        for (const meta of metas) document.head.appendChild(meta);
-        img.remove();
-      };
-      img.src = dataURL('/r', { pass: password.length !== 0 ? password : undefined });
-    }
-    if (mediaType === 'video') {
-      if (document.getElementsByClassName('dynamic').length !== 0) return;
-      const vid = document.createElement('video');
-      vid.onloadedmetadata = function () {
-        if (document.getElementsByClassName('dynamic').length !== 0) return;
-        file.mediaProps = {
-          width: vid.videoWidth,
-          height: vid.videoHeight,
+        img.src = dataURL('/r', false, false, password);
+      }
+      if (mediaType === 'video') {
+        const vid = document.createElement('video');
+        vid.onloadedmetadata = function () {
+          if (document.head.getElementsByClassName('dynamic').length !== 0) return;
+          file.mediaProps = {
+            width: vid.videoWidth,
+            height: vid.videoHeight,
+          };
+          for (const meta of metas) {
+            meta[0].setAttribute('content', file.mediaProps.width.toString());
+            meta[1].setAttribute('content', file.mediaProps.height.toString());
+            document.head.appendChild(meta[0]);
+            document.head.appendChild(meta[1]);
+          }
+          vid.remove();
         };
-        const metas: HTMLMetaElement[] = [];
-        for (let i = 0; i !== 2; i++) {
-          const metaW = document.createElement('meta');
-          const metaH = document.createElement('meta');
-          metaW.setAttribute('name', i % 2 ? 'twitter:player:width' : 'og:video:width');
-          metaH.setAttribute('name', i % 2 ? 'twitter:player:height' : 'og:video:height');
-          metaW.setAttribute('content', file.mediaProps.width.toString());
-          metaH.setAttribute('content', file.mediaProps.width.toString());
-          metaW.className = 'dynamic';
-          metaH.className = 'dynamic';
-          metas.push(...[metaW, metaH]);
-        }
-        for (const meta of metas) document.head.appendChild(meta);
-        vid.remove();
-      };
-      vid.src = dataURL('/r', { pass: password.length !== 0 ? password : undefined });
-      vid.load();
+        vid.src = dataURL('/r', false, false, password);
+        vid.load();
+      }
     }
+
     if (url) mediaContent.src = url;
   };
 
@@ -153,11 +152,9 @@ export default function EmbeddedFile({
       <Head>
         <meta
           property='og:url'
-          content={dataURL(router.asPath.replace(('/' + router.query['id']) as string, ''), {
-            withHost: true,
-          })}
+          content={dataURL(router.asPath.replace(('/' + router.query['id']) as string, ''))}
         />
-        {!embed && !file.embed && mediaType === 'image' && (
+        {!embed && !file.embed && (
           <link rel='alternate' type='application/json+oembed' href={`${host}/api/oembed/${file.id}`} />
         )}
         {user.embed.title && file.embed && (
@@ -180,29 +177,15 @@ export default function EmbeddedFile({
             <meta name='og:title' content={file.name} />
             <meta property='twitter:title' content={file.name} />
             {mediaType === 'image' && (
-              <meta
-                name='twitter:image'
-                content={dataURL('/r', { withHost: true, pass: password.length == 0 ? undefined : password })}
-              />
+              <meta name='twitter:image' content={dataURL('/r', false, false, password)} />
             )}
             {mediaType === 'image' && <meta property='twitter:card' content='summary_large_image' />}
           </>
         )}
         {mediaType === 'image' && (
           <>
-            <meta
-              property='og:image'
-              itemProp='image'
-              content={dataURL('/r', { withHost: true, pass: password.length == 0 ? undefined : password })}
-            />
-            <meta
-              property='og:image:secure_url'
-              content={dataURL('/r', {
-                withHost: true,
-                useThumb: true,
-                pass: password.length == 0 ? undefined : password,
-              })}
-            />
+            <meta property='og:image' itemProp='image' content={dataURL('/r', false, false, password)} />
+            <meta property='og:image:secure_url' content={dataURL('/r', false, false, password)} />
             <meta property='og:image:alt' content={file.name} />
             <meta property='og:image:type' content={file.mimetype} />
           </>
@@ -213,73 +196,47 @@ export default function EmbeddedFile({
                 <meta
                   property='og:image:url'
                   key='og:image:url'
-                  content={dataURL('/r', {
-                    withHost: true,
-                    useThumb: true,
-                    pass: password.length == 0 ? undefined : password,
-                  })}
+                  content={dataURL('/r', true, false, password)}
                 />,
                 <meta
                   property='og:image:secure_url'
                   key='og:image:secure_url'
-                  content={dataURL('/r', {
-                    withHost: true,
-                    useThumb: true,
-                    pass: password.length == 0 ? undefined : password,
-                  })}
+                  content={dataURL('/r', true)}
                 />,
                 <meta property='og:image:type' key='og:image:type' content='image/jpeg' />,
                 <meta
                   name='twitter:image'
                   key='twitter:image'
-                  content={dataURL('/r', {
-                    withHost: true,
-                    useThumb: true,
-                    pass: password.length == 0 ? undefined : password,
-                  })}
+                  content={dataURL('/r', true, false, password)}
                 />,
               ]
             : []),
           <meta name='twitter:card' key='twitter:card' content='player' />,
-          <meta
-            name='twitter:player'
-            key='twitter:player'
-            content={dataURL('/r', { withHost: true, pass: password.length == 0 ? undefined : password })}
-          />,
+          <meta name='twitter:player' key='twitter:player' content={dataURL('/r', false, false, password)} />,
           <meta
             name='twitter:player:stream'
             key='twitter:player:stream'
-            content={dataURL('/r', { withHost: true, pass: password.length == 0 ? undefined : password })}
+            content={dataURL('/r', false, false, password)}
           />,
           <meta
             name='twitter:player:stream:content_type'
             key='twitter:player:stream:content_type'
             content={file.mimetype}
           />,
-          <meta property='og:type' key='og:type' content='video.movie' />,
-          <meta
-            property='og:video'
-            key='og:video'
-            content={dataURL('/r', { withHost: true, pass: password.length == 0 ? undefined : password })}
-          />,
+          <meta property='og:type' key='og:type' content='video.other' />,
+          <meta property='og:video' key='og:video' content={dataURL('/r', false, false, password)} />,
           <meta
             property='og:video:secure_url'
             key='og:video:secure_url'
-            content={dataURL('/r', { withHost: true, pass: password.length == 0 ? undefined : password })}
+            content={dataURL('/r', false, false, password)}
           />,
           <meta property='og:video:type' key='og:video:type' content={file.mimetype} />,
         ]}
         {mediaType === 'audio' && (
           <>
             <meta property='og:type' content='music.song' />
-            <meta
-              property='og:audio'
-              content={dataURL('/r', { withHost: true, pass: password.length == 0 ? undefined : password })}
-            />
-            <meta
-              property='og:audio:secure_url'
-              content={dataURL('/r', { withHost: true, pass: password.length == 0 ? undefined : password })}
-            />
+            <meta property='og:audio' content={dataURL('/r', false, false, password)} />
+            <meta property='og:audio:secure_url' content={dataURL('/r', false, false, password)} />
             <meta property='og:audio:type' content={file.mimetype} />
           </>
         )}
@@ -365,8 +322,8 @@ export default function EmbeddedFile({
       >
         {mediaType === 'image' && (
           <img
-            src={dataURL('/r')}
-            alt={dataURL('/r')}
+            src={dataURL('/r', false, true, password)}
+            alt={dataURL('/r', false, true, password)}
             id='image_content'
             style={{
               transition: 'transform 0.25s ease',
@@ -383,7 +340,7 @@ export default function EmbeddedFile({
               maxHeight: '100vh',
               maxWidth: '100vw',
             }}
-            src={dataURL('/r')}
+            src={dataURL('/r', false, true, password)}
             controls
             autoPlay
             muted
@@ -391,10 +348,12 @@ export default function EmbeddedFile({
           />
         )}
 
-        {mediaType === 'audio' && <audio src={dataURL('/r')} controls autoPlay muted id='audio_content' />}
+        {mediaType === 'audio' && (
+          <audio src={dataURL('/r', false, true)} controls autoPlay muted id='audio_content' />
+        )}
 
         {mediaType === 'other' && (
-          <AnchorNext component={Link} href={dataURL('/r', { pass: downloadWPass ? password : undefined })}>
+          <AnchorNext component={Link} href={dataURL('/r', false, true, password)}>
             Can&#39;t preview this file. Click here to download it.
           </AnchorNext>
         )}