Merge branch 'master' into pr/hbjydev/454

1 files changed, 11 insertions, 3 deletions

diff --git a/cdn/src/util/FileStorage.ts b/cdn/src/util/FileStorage.ts

index e0b24a84..84ecf556 100644
--- a/cdn/src/util/FileStorage.ts
+++ b/cdn/src/util/FileStorage.ts
@@ -13,16 +13,24 @@ function getPath(path: string) {
 	const root = process.env.STORAGE_LOCATION || "../";
 	var filename = join(root, path);
 
-	if (path.indexOf("\0") !== -1 || !filename.startsWith(root)) throw new Error("invalid path");
+	if (path.indexOf("\0") !== -1 || !filename.startsWith(root))
+		throw new Error("invalid path");
 	return filename;
 }
 
 export class FileStorage implements Storage {
 	async get(path: string): Promise<Buffer | null> {
+		path = getPath(path);
 		try {
-			return fs.readFileSync(getPath(path));
+			return fs.readFileSync(path);
 		} catch (error) {
-			return null;
+			try {
+				const files = fs.readdirSync(path);
+				if (!files.length) return null;
+				return fs.readFileSync(join(path, files[0]));
+			} catch (error) {
+				return null;
+			}
 		}
 	}