fix: no requires NAME and AVATAR if app is site

discloud · Sep 22, 2022 · 3aa13ba · 3aa13ba
1 parent 3a0232e
commit 3aa13ba
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/src/commands/upload.ts b/src/commands/upload.ts
@@ -1,9 +1,9 @@
-import { RESTPostApiUploadResult, Routes } from "@discloudapp/api-types/v2";
+import { DiscloudConfig, RESTPostApiUploadResult, Routes } from "@discloudapp/api-types/v2";
 import FormData from "form-data";
 import { GluegunCommand, GluegunToolbox } from "gluegun";
 import { exit } from "node:process";
 import { apidiscloud, config, configToObj, configUpdate, getMissingValues, getNotIngnoredFiles, makeZipFromFileList, RateLimit, readDiscloudConfig, verifyRequiredFiles } from "../util";
-import { FileExt, requiredDiscloudConfigProps } from "../util/constants";
+import { FileExt, mapDiscloudConfigProps, requiredDiscloudConfigProps } from "../util/constants";
 
 export default new class Upload implements GluegunCommand {
   name = "upload";
@@ -28,12 +28,15 @@ export default new class Upload implements GluegunCommand {
       if (!filesystem.exists(parameters.first))
         return print.error(`${parameters.first} file does not exists.`);
     } else {
-      const dConfig = configToObj<string>(readDiscloudConfig(parameters.first)!);
+      const dConfig = <DiscloudConfig>configToObj<any>(readDiscloudConfig(parameters.first)!);
 
-      const missing = getMissingValues(dConfig, requiredDiscloudConfigProps);
+      const missing = getMissingValues(dConfig, requiredDiscloudConfigProps[dConfig.TYPE]);
 
-      if (missing.length)
-        return print.error(`${missing[0]} param is missing from discloud.config`);
+      if (missing.length) {
+        const missingProp = mapDiscloudConfigProps[dConfig.TYPE]?.[missing[0]] ?? missing[0];
+
+        return print.error(`${missingProp} param is missing from discloud.config`);
+      }
 
       const fileExt = <`${FileExt}`>dConfig.MAIN.split(".").pop();
       if (!verifyRequiredFiles(parameters.first, fileExt, dConfig.MAIN)) return;

diff --git a/src/util/constants.ts b/src/util/constants.ts
@@ -43,7 +43,16 @@ export const required_files = {
   ts: ["package.json"],
 };
 
-export const requiredDiscloudConfigProps = ["MAIN", "NAME", "TYPE", "RAM", "VERSION"];
+export const mapDiscloudConfigProps = <Record<string, Record<string, string>>>{
+  site: {
+    ID: "subdomain",
+  },
+};
+
+export const requiredDiscloudConfigProps = {
+  bot: ["MAIN", "NAME", "TYPE", "RAM", "VERSION"],
+  site: ["ID", "MAIN", "TYPE", "RAM", "VERSION"],
+};
 
 export const ModPermissions = {
   backup_app: 1,

diff --git a/src/util/index.ts b/src/util/index.ts
@@ -26,7 +26,7 @@ export const apidiscloud = http.create({
   },
 });
 
-export function configToObj<T = number | string>(s: string): Record<string, T> {
+export function configToObj<T = boolean | number | string>(s: string): Record<string, T> {
   if (typeof s !== "string") return {};
   return Object.fromEntries(s.split(/\r?\n/).map(a => a.split("=")));
 }