Merge branch 'main' into main

sern-handler · May 27, 2024 · 7172afe · 7172afe
2 parents 69a0acd + fe2e8ff
commit 7172afe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 17 deletions.
diff --git a/src/create-publish.mts b/src/create-publish.mts
@@ -79,24 +79,18 @@ for await (const absPath of filePaths) {
         commandModule = commandModule.default;
     }
 
-
-
-    try {
-        commandModule = commandModule.getInstance();
-    } catch {}
-
     if ((PUBLISHABLE & commandModule.type) != 0) {
         // assign defaults
         const filename = basename(absPath);
         const filenameNoExtension = filename.substring(0, filename.lastIndexOf('.'));
         commandModule.name ??= filenameNoExtension;
         commandModule.description ??= '';
         commandModule.absPath = absPath;
+        if (typeof config === 'function') {
+            config = config(absPath, commandModule);
+        }
         modules.push({ commandModule, config });
     }
-    if (typeof config === 'function') {
-        config = config(absPath, commandModule);
-    }
 }
 
 const cacheDir = resolve('./.sern');
@@ -158,9 +152,9 @@ const makePublishData = ({ commandModule, config }: Record<string, Record<string
             integration_types: (config?.integrationTypes ?? ['Guild']).map(
                 (s: string) => {
                     if(s === "Guild") {
-                        return 0
+                        return "0"
                     } else if (s == "User") {
-                        return 1
+                        return "1"
                     } else {
                         throw Error("IntegrationType is not one of Guild or User");
                     }
@@ -287,7 +281,6 @@ const remoteData = {
     global: globalCommandsResponse,
     ...Object.fromEntries(guildCommandMapResponse),
 };
-
 await writeFile(resolve(cacheDir, 'command-data-remote.json'), JSON.stringify(remoteData, null, 4), 'utf8');
 
 // TODO: add this in a verbose flag

diff --git a/src/rest.ts b/src/rest.ts
@@ -4,12 +4,12 @@ const baseURL = new URL('https://discord.com/api/v10/applications/');
 
 const excludedKeys = new Set(['command', 'absPath']);
 
-const publishablesIntoJson = (ps: PublishableModule[]) =>
-    JSON.stringify(
+const publishablesIntoJson = (ps: PublishableModule[]) => {
+    const s = JSON.stringify(
         ps.map((module) => module.data),
-        (key, value) => (excludedKeys.has(key) ? undefined : value),
-        4
-    );
+        (key, value) => (excludedKeys.has(key) ? undefined : value), 4);
+    return s;
+}
 
 export const create = async (token: string) => {
     const headers = {