From 5965c2e2370799f8cedaa5961b435389c1aca4e8 Mon Sep 17 00:00:00 2001
From: diced <pranaco2@gmail.com>
Date: Sun, 19 Jun 2022 16:44:55 -0700
Subject: [PATCH] fix(config): extention -> extension

---
 config.example.toml          | 2 +-
 src/lib/config.ts            | 3 +--
 src/lib/readConfig.ts        | 4 ++--
 src/lib/types.ts             | 2 +-
 src/pages/api/upload.ts      | 2 +-
 src/server/validateConfig.ts | 6 +++---
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/config.example.toml b/config.example.toml
index 5ec8eb3a..b8660400 100644
--- a/config.example.toml
+++ b/config.example.toml
@@ -16,4 +16,4 @@ length = 6
 directory = './uploads'
 user_limit = 104900000 # 100mb
 admin_limit = 104900000 # 100mb
-disabled_extentions = ['jpg']
+disabled_extensions = ['jpg']
diff --git a/src/lib/config.ts b/src/lib/config.ts
index cfb2eac6..d0b162c1 100644
--- a/src/lib/config.ts
+++ b/src/lib/config.ts
@@ -1,7 +1,6 @@
-import type { Config } from './types';
 import readConfig from './readConfig';
 import validateConfig from '../server/validateConfig';
 
-if (!global.config) global.config = validateConfig(readConfig()) as unknown as Config;
+if (!global.config) global.config = validateConfig(readConfig());
 
 export default global.config;
\ No newline at end of file
diff --git a/src/lib/readConfig.ts b/src/lib/readConfig.ts
index 3feb92c2..b4dd4683 100644
--- a/src/lib/readConfig.ts
+++ b/src/lib/readConfig.ts
@@ -27,7 +27,7 @@ const envValues = [
   e('UPLOADER_LENGTH', 'number', (c, v) => c.uploader.length = v),
   e('UPLOADER_ADMIN_LIMIT', 'number', (c, v) => c.uploader.admin_limit = v),
   e('UPLOADER_USER_LIMIT', 'number', (c, v) => c.uploader.user_limit = v),
-  e('UPLOADER_DISABLED_EXTS', 'array', (c, v) => v ? c.uploader.disabled_extentions = v : c.uploader.disabled_extentions = []),
+  e('UPLOADER_DISABLED_EXTS', 'array', (c, v) => v ? c.uploader.disabled_extensions = v : c.uploader.disabled_extensions = []),
 
   e('URLS_ROUTE', 'string', (c, v) => c.urls.route = v),
   e('URLS_LENGTH', 'number', (c, v) => c.urls.length = v),
@@ -80,7 +80,7 @@ function tryReadEnv(): Config {
       length: undefined,
       admin_limit: undefined,
       user_limit: undefined,
-      disabled_extentions: undefined,
+      disabled_extensions: undefined,
     },
     urls: {
       route: undefined,
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 1668e1a5..864ab8a5 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -57,7 +57,7 @@ export interface ConfigUploader {
   user_limit: number;
 
   // Disabled extensions to block from uploading
-  disabled_extentions: string[];
+  disabled_extensions: string[];
 }
 
 export interface ConfigUrls {
diff --git a/src/pages/api/upload.ts b/src/pages/api/upload.ts
index 7f67f74e..a2cfc592 100644
--- a/src/pages/api/upload.ts
+++ b/src/pages/api/upload.ts
@@ -38,7 +38,7 @@ async function handler(req: NextApiReq, res: NextApiRes) {
     if (file.size > zconfig.uploader[user.administrator ? 'admin_limit' : 'user_limit']) return res.error(`file[${i}] size too big`);
 
     const ext = file.originalname.split('.').pop();
-    if (zconfig.uploader.disabled_extentions.includes(ext)) return res.error('disabled extension recieved: ' + ext);
+    if (zconfig.uploader.disabled_extensions.includes(ext)) return res.error('disabled extension recieved: ' + ext);
     let fileName: string;
 
     switch (format) {
diff --git a/src/server/validateConfig.ts b/src/server/validateConfig.ts
index c697d8ee..3b41a15e 100644
--- a/src/server/validateConfig.ts
+++ b/src/server/validateConfig.ts
@@ -51,12 +51,12 @@ export default function validate(config): Config {
       if (!validated.datasource.s3.access_key_id) errors.push('datasource.s3.access_key_id is a required field');
       if (!validated.datasource.s3.secret_access_key) errors.push('datasource.s3.secret_access_key is a required field');
       if (!validated.datasource.s3.bucket) errors.push('datasource.s3.bucket is a required field');
-      if (errors.length) throw { errors }; 
+      if (errors.length) throw { errors };
     }
-
+    
     return validated as unknown as Config;
   } catch (e) {
     if (process.env.ZIPLINE_DOCKER_BUILD) return null;
     throw `${e.errors.length} errors occured\n${e.errors.map(x => '\t' + x).join('\n')}`;
-  } 
+  }
 };
\ No newline at end of file