@open-discord-bots/framework 0.0.5 → 0.0.7

package/dist/api/modules/responder.js

@@ -1110,16 +1110,9 @@ class ODModalResponderInstance {
     async reply(msg) {
         try {
             const msgFlags = msg.ephemeral ? [discord.MessageFlags.Ephemeral] : [];
-            if (this.interaction.replied || this.interaction.deferred) {
-                const sent = await this.interaction.editReply(Object.assign(msg.message, { flags: msgFlags }));
-                this.didReply = true;
-                return { success: true, message: sent };
-            }
-            else {
-                const sent = await this.interaction.reply(Object.assign(msg.message, { flags: msgFlags }));
-                this.didReply = true;
-                return { success: true, message: await sent.fetch() };
-            }
+            const sent = await this.interaction.followUp(Object.assign(msg.message, { flags: msgFlags }));
+            this.didReply = true;
+            return { success: true, message: sent };
         }
         catch {
             return { success: false, message: null };
@@ -1134,8 +1127,11 @@ class ODModalResponderInstance {
                 this.didReply = true;
                 return { success: true, message: await sent.fetch() };
             }
-            else
-                throw new base_1.ODSystemError("Unable to update modal interaction!");
+            else {
+                const sent = await this.interaction.reply(Object.assign(msg.message, { flags: msgFlags }));
+                this.didReply = true;
+                return { success: true, message: await sent.fetch() };
+            }
         }
         catch {
             return { success: false, message: null };

package/dist/index.js

@@ -43,3 +43,6 @@ var pluginLauncher_1 = require("./startup/pluginLauncher");
 Object.defineProperty(exports, "loadAllPlugins", { enumerable: true, get: function () { return pluginLauncher_1.loadAllPlugins; } });
 var compilation_1 = require("./startup/compilation");
 Object.defineProperty(exports, "frameworkStartup", { enumerable: true, get: function () { return compilation_1.frameworkStartup; } });
+const compilation_2 = require("./startup/compilation");
+//check directory structure
+(0, compilation_2.checkFrameworkAllowed)();

package/dist/startup/compilation.d.ts

@@ -1,2 +1,3 @@
 import type { ODProjectType } from "../api/api";
+export declare function checkFrameworkAllowed(project?: ODProjectType): void;
 export declare function frameworkStartup(startupFlags: string[], project: ODProjectType, startCallback: () => void): void;

package/dist/startup/compilation.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkFrameworkAllowed = checkFrameworkAllowed;
 exports.frameworkStartup = frameworkStartup;
 const fs_1 = __importDefault(require("fs"));
 const typescript_1 = __importDefault(require("typescript"));
@@ -62,11 +63,8 @@ function saveNewCompilationHash() {
     const hash = sourceHash + ":" + pluginHash;
     fs_1.default.writeFileSync("./dist/hash.txt", hash);
 }
-function frameworkStartup(startupFlags, project, startCallback) {
-    const logTitle = (project == "openticket") ? "OT" : "OM";
-    //push additional startup flags (for pterodactyl panels)
-    process.argv.push(...startupFlags);
-    //check directory structure
+function checkFrameworkAllowed(project) {
+    const logTitle = (project) ? ((project == "openticket") ? "OT" : "OM") : "OD";
     const requiredStructures = [
         "index.js",
         "./package.json",
@@ -94,6 +92,13 @@ function frameworkStartup(startupFlags, project, startCallback) {
         throw new Error(logTitle + ": Please do not use this framework in third party bots or outside Open Ticket/Moderation! (2)");
     if (!readmeContents.includes("DJdj Development") || !readmeContents.includes("DJj123dj"))
         throw new Error(logTitle + ": Please do not use this framework in third party bots or outside Open Ticket/Moderation! (3)");
+}
+function frameworkStartup(startupFlags, project, startCallback) {
+    const logTitle = (project == "openticket") ? "OT" : "OM";
+    //push additional startup flags (for pterodactyl panels)
+    process.argv.push(...startupFlags);
+    //check directory structure
+    checkFrameworkAllowed(project);
     //start compilation
     if (!process.argv.includes("--no-compile")) {
         const requiredDependencies = new Set();

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@open-discord-bots/framework",
     "author": "DJj123dj",
-    "version": "0.0.5",
+    "version": "0.0.7",
     "description": "The core framework of the popular open-source discord bots: Open Ticket & Open Moderation.",
     "main": "dist/index.js",
     "module": "dist/index.js",

package/src/api/modules/responder.ts

@@ -1071,15 +1071,9 @@ export class ODModalResponderInstance {
     async reply(msg:ODMessageBuildResult): Promise<ODMessageBuildSentResult<boolean>> {
         try{
             const msgFlags: number[] = msg.ephemeral ? [discord.MessageFlags.Ephemeral] : []
-            if (this.interaction.replied || this.interaction.deferred){
-                const sent = await this.interaction.editReply(Object.assign(msg.message,{flags:msgFlags}))
-                this.didReply = true
-                return {success:true,message:sent}
-            }else{
-                const sent = await this.interaction.reply(Object.assign(msg.message,{flags:msgFlags}))
-                this.didReply = true
-                return {success:true,message:await sent.fetch()}
-            }
+            const sent = await this.interaction.followUp(Object.assign(msg.message,{flags:msgFlags}))
+            this.didReply = true
+            return {success:true,message:sent}
         }catch{
             return {success:false,message:null}
         }
@@ -1092,7 +1086,11 @@ export class ODModalResponderInstance {
                 const sent = await this.interaction.editReply(Object.assign(msg.message,{flags:msgFlags}))
                 this.didReply = true
                 return {success:true,message:await sent.fetch()}
-            }else throw new ODSystemError("Unable to update modal interaction!")
+            }else{
+                const sent = await this.interaction.reply(Object.assign(msg.message,{flags:msgFlags}))
+                this.didReply = true
+                return {success:true,message:await sent.fetch()}
+            }
         }catch{
             return {success:false,message:null}
         }

package/src/index.ts

@@ -1,6 +1,11 @@
+
 export * as api from "./api/api"
 export * as utilities from "./api/utils"
 export * as cli from "./cli/cli"
 export { loadDumpCommand } from "./startup/dump"
 export { loadAllPlugins } from "./startup/pluginLauncher"
-export { frameworkStartup } from "./startup/compilation"
+export { frameworkStartup } from "./startup/compilation"
+import { checkFrameworkAllowed } from "./startup/compilation"
+
+//check directory structure
+checkFrameworkAllowed()

package/src/startup/compilation.ts

@@ -60,13 +60,8 @@ function saveNewCompilationHash(){
     fs.writeFileSync("./dist/hash.txt",hash)
 }
 
-export function frameworkStartup(startupFlags:string[],project:ODProjectType,startCallback:() => void){
-    const logTitle = (project == "openticket") ? "OT" : "OM"
-
-    //push additional startup flags (for pterodactyl panels)
-    process.argv.push(...startupFlags)
-
-    //check directory structure
+export function checkFrameworkAllowed(project?:ODProjectType){
+    const logTitle = (project) ? ((project == "openticket") ? "OT" : "OM") : "OD"
     const requiredStructures: string[] = [
         "index.js",
         "./package.json",
@@ -92,7 +87,17 @@ export function frameworkStartup(startupFlags:string[],project:ODProjectType,sta
         !readmeContents.includes(`<img src="https://apis.dj-dj.be/cdn/openmoderation/logo.png" alt="Open Moderation" width="650px">`)
     ) throw new Error(logTitle+": Please do not use this framework in third party bots or outside Open Ticket/Moderation! (2)")
     if (!readmeContents.includes("DJdj Development") || !readmeContents.includes("DJj123dj")) throw new Error(logTitle+": Please do not use this framework in third party bots or outside Open Ticket/Moderation! (3)")
+}
 
+export function frameworkStartup(startupFlags:string[],project:ODProjectType,startCallback:() => void){
+    const logTitle = (project == "openticket") ? "OT" : "OM"
+
+    //push additional startup flags (for pterodactyl panels)
+    process.argv.push(...startupFlags)
+
+    //check directory structure
+    checkFrameworkAllowed(project)
+    
     //start compilation
     if (!process.argv.includes("--no-compile")){
         const requiredDependencies: Set<string> = new Set()