From 94023d395fcc8dda2a6b95932b2f90dfa77fb403 Mon Sep 17 00:00:00 2001
From: zkldi <20380519+zkldi@users.noreply.github.com>
Date: Sat, 13 Nov 2021 20:36:36 +0000
Subject: [PATCH] Add S3 KEY_PREFIX support

---
 server/src/lib/cdn/s3.ts       | 2 +-
 server/src/lib/setup/config.ts | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/src/lib/cdn/s3.ts b/server/src/lib/cdn/s3.ts
index 8ee269535..3730fe214 100644
--- a/server/src/lib/cdn/s3.ts
+++ b/server/src/lib/cdn/s3.ts
@@ -35,7 +35,7 @@ export function PushToS3(path: string, content: Buffer | string) {
 	return s3.send(
 		new PutObjectCommand({
 			Bucket: ServerConfig.CDN_CONFIG.SAVE_LOCATION.BUCKET,
-			Key: path,
+			Key: (ServerConfig.CDN_CONFIG.SAVE_LOCATION.KEY_PREFIX ?? "") + path,
 			Body: content,
 		})
 	);
diff --git a/server/src/lib/setup/config.ts b/server/src/lib/setup/config.ts
index cf9fbd1ac..1988d7d4b 100644
--- a/server/src/lib/setup/config.ts
+++ b/server/src/lib/setup/config.ts
@@ -108,6 +108,7 @@ export interface TachiServerConfig {
 					ACCESS_KEY: string;
 					SECRET_ACCESS_KEY: string;
 					BUCKET: string;
+					KEY_PREFIX?: string;
 			  };
 	};
 }
@@ -184,6 +185,7 @@ const err = p(config, {
 				ACCESS_KEY: "string",
 				SECRET_ACCESS_KEY: "string",
 				BUCKET: "string",
+				KEY_PREFIX: "*string",
 			}
 		),
 	},