From dc2fb029f53259a535d704feaf80609a2d597f3f Mon Sep 17 00:00:00 2001
From: Jesse Wierzbinski <contact@cpluspatch.com>
Date: Tue, 9 Apr 2024 16:54:33 -1000
Subject: [PATCH] Fix various file upload issues across server

---
 cli.ts                                                 | 2 +-
 server/api/api/v1/accounts/update_credentials/index.ts | 8 ++++----
 server/api/api/v1/media/[id]/index.ts                  | 4 ++--
 server/api/api/v2/media/index.ts                       | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cli.ts b/cli.ts
index fddee938..2d9f7836 100644
--- a/cli.ts
+++ b/cli.ts
@@ -1251,7 +1251,7 @@ const cliBuilder = new CliBuilder([
                     return 1;
                 }
 
-                newUrl = getUrl(metadata.uploadedFile.name, config);
+                newUrl = getUrl(metadata.path, config);
 
                 console.log(
                     `${chalk.green("✓")} Uploaded emoji to object storage`,
diff --git a/server/api/api/v1/accounts/update_credentials/index.ts b/server/api/api/v1/accounts/update_credentials/index.ts
index 46578ed4..a02c9b29 100644
--- a/server/api/api/v1/accounts/update_credentials/index.ts
+++ b/server/api/api/v1/accounts/update_credentials/index.ts
@@ -178,9 +178,9 @@ export default apiRoute<{
             );
         }
 
-        const { uploadedFile } = await mediaManager.addFile(avatar);
+        const { path } = await mediaManager.addFile(avatar);
 
-        user.avatar = getUrl(uploadedFile.name, config);
+        user.avatar = getUrl(path, config);
     }
 
     if (header) {
@@ -192,9 +192,9 @@ export default apiRoute<{
             );
         }
 
-        const { uploadedFile } = await mediaManager.addFile(header);
+        const { path } = await mediaManager.addFile(header);
 
-        user.header = getUrl(uploadedFile.name, config);
+        user.header = getUrl(path, config);
     }
 
     if (locked) {
diff --git a/server/api/api/v1/media/[id]/index.ts b/server/api/api/v1/media/[id]/index.ts
index 4d5e5ebe..fcb855e8 100644
--- a/server/api/api/v1/media/[id]/index.ts
+++ b/server/api/api/v1/media/[id]/index.ts
@@ -74,8 +74,8 @@ export default apiRoute<{
             }
 
             if (thumbnail) {
-                const { uploadedFile } = await mediaManager.addFile(thumbnail);
-                thumbnailUrl = getUrl(uploadedFile.name, config);
+                const { path } = await mediaManager.addFile(thumbnail);
+                thumbnailUrl = getUrl(path, config);
             }
 
             const descriptionText = description || attachment.description;
diff --git a/server/api/api/v2/media/index.ts b/server/api/api/v2/media/index.ts
index dc062d30..31810dbf 100644
--- a/server/api/api/v2/media/index.ts
+++ b/server/api/api/v2/media/index.ts
@@ -121,17 +121,17 @@ export default apiRoute<{
     }
 
     if (isImage) {
-        const { uploadedFile } = await mediaManager.addFile(file);
+        const { path } = await mediaManager.addFile(file);
 
-        url = getUrl(uploadedFile.name, config);
+        url = getUrl(path, config);
     }
 
     let thumbnailUrl = "";
 
     if (thumbnail) {
-        const { uploadedFile } = await mediaManager.addFile(thumbnail);
+        const { path } = await mediaManager.addFile(thumbnail);
 
-        thumbnailUrl = getUrl(uploadedFile.name, config);
+        thumbnailUrl = getUrl(path, config);
     }
 
     const newAttachment = await client.attachment.create({