@open-discord-bots/framework 0.3.11 → 0.3.13

package/dist/api/main.js

@@ -44,7 +44,7 @@ export class ODMain {
     constructor(managers, project) {
         this.project = project;
         this.versions = managers.versions;
-        this.versions.add(ODVersion.fromString("opendiscord:api", "v0.3.11"));
+        this.versions.add(ODVersion.fromString("opendiscord:api", "v0.3.13"));
         this.versions.add(ODVersion.fromString("opendiscord:livestatus", "v2.0.0"));
         this.debugfile = managers.debugfile;
         this.console = managers.console;

package/dist/api/modules/component.d.ts

@@ -1,6 +1,6 @@
 import { ODId, ODValidId, ODManagerData, ODNoGeneric, ODManager, ODValidButtonColor, ODInterfaceWithPartialProperty } from "./base.js";
 import * as discord from "discord.js";
-import { ODWorkerManager, ODWorkerCallback, ODWorker } from "./worker.js";
+import { ODWorkerManager, ODWorkerCallback } from "./worker.js";
 import { ODDebugger } from "./console.js";
 import { ODMessage, ODMessageInstance } from "./builder.js";
 /**## ODComponentFactoryInstance `class`
@@ -60,7 +60,7 @@ export declare class ODBaseComponentManager<IdList extends ODComponentManagerIdC
 /**## ODComponentModifierManagerIdConstraint `type`
  * The constraint/layout for id mappings/interfaces of the `ODComponentModifierManager` class.
  */
-export type ODComponentModifierManagerIdConstraint = Record<string, ODMessageComponentModifier<string, {}>>;
+export type ODComponentModifierManagerIdConstraint = Record<string, ODMessageComponentModifier<string, {}, string>>;
 /**## ODComponentModifierManager `class`
  * An Open Discord component modifier manager.
  *
@@ -68,12 +68,12 @@ export type ODComponentModifierManagerIdConstraint = Record<string, ODMessageCom
  * - Patch, modify, expand or update existing messages
  * - It Does not affect the original message (cloned)
  */
-export declare class ODComponentModifierManager<IdList extends ODComponentModifierManagerIdConstraint = ODComponentModifierManagerIdConstraint> extends ODManager<ODMessageComponentModifier<string, {}>> {
+export declare class ODComponentModifierManager<IdList extends ODComponentModifierManagerIdConstraint = ODComponentModifierManagerIdConstraint> extends ODManager<ODMessageComponentModifier<string, {}, string>> {
     constructor(debug: ODDebugger);
     get<ModifierId extends keyof ODNoGeneric<IdList>>(id: ModifierId): IdList[ModifierId];
-    get(id: ODValidId): ODMessageComponentModifier<string, {}> | null;
+    get(id: ODValidId): ODMessageComponentModifier<string, {}, string> | null;
     remove<ModifierId extends keyof ODNoGeneric<IdList>>(id: ModifierId): IdList[ModifierId];
-    remove(id: ODValidId): ODMessageComponentModifier<string, {}> | null;
+    remove(id: ODValidId): ODMessageComponentModifier<string, {}, string> | null;
     exists(id: keyof ODNoGeneric<IdList>): boolean;
     exists(id: ODValidId): boolean;
 }
@@ -245,14 +245,12 @@ export declare abstract class ODParentComponent<Data extends object, ChildCompon
  *
  * Warning: If workers access external variables (outside parameters), the clone will still use those variables. This might result in unexpected behaviour!
  */
-export declare class ODMessageComponentModifier<Origin extends string, Params> extends ODManagerData {
-    /**The worker which will modify the message. */
-    worker: ODWorker<ODMessageInstance | ODComponentFactoryInstance<ODMessageComponent>, Origin, Params> | null;
-    constructor(id: ODValidId, worker?: ODWorker<ODMessageInstance | ODComponentFactoryInstance<ODMessageComponent>, Origin, Params>);
-    /**Modify an `ODMessage` or `ODComponentFactory` with the worker. A copy will be returned and the original is preserved. */
-    modify<Message extends ODMessage<any, any, any> | ODComponentFactory<ODMessageComponent, any, any, any>>(message: Message): Message;
-    /**Change the worker of this component modifier. */
-    setWorker(worker: ODWorker<ODMessageInstance | ODComponentFactoryInstance<ODMessageComponent>, Origin, Params> | null): void;
+export declare class ODMessageComponentModifier<Origin extends string, Params, WorkerIds extends string> extends ODManagerData {
+    /**The workers which will modify the message. */
+    workers: ODWorkerManager<ODMessageInstance | ODComponentFactoryInstance<ODMessageComponent>, Origin, Params, WorkerIds>;
+    constructor(id: ODValidId, callback?: ODWorkerCallback<ODMessageInstance | ODComponentFactoryInstance<ODMessageComponent>, Origin, Params>, priority?: number, callbackId?: ODValidId);
+    /**Modify an `ODMessage` or `ODComponentFactory` with these workers. A copy will be returned and the original is preserved. */
+    modify<Message extends ODMessage<any, any, any> | ODComponentFactory<ODMessageComponent, any, any, any>>(message: Message, origin: Origin, params: Params): Message;
 }
 /**## ODMessageComponentData `type`
  * The configurable settings/options for the `ODMessageComponent`.

package/dist/api/modules/component.js

@@ -323,23 +323,22 @@ export class ODParentComponent extends ODComponent {
  * Warning: If workers access external variables (outside parameters), the clone will still use those variables. This might result in unexpected behaviour!
  */
 export class ODMessageComponentModifier extends ODManagerData {
-    /**The worker which will modify the message. */
-    worker;
-    constructor(id, worker) {
+    /**The workers which will modify the message. */
+    workers;
+    constructor(id, callback, priority, callbackId) {
         super(id);
-        this.worker = worker ?? null;
+        this.workers = new ODWorkerManager("ascending");
+        if (callback)
+            this.workers.add(new ODWorker(callbackId ? callbackId : id, priority ?? 0, callback));
     }
-    /**Modify an `ODMessage` or `ODComponentFactory` with the worker. A copy will be returned and the original is preserved. */
-    modify(message) {
+    /**Modify an `ODMessage` or `ODComponentFactory` with these workers. A copy will be returned and the original is preserved. */
+    modify(message, origin, params) {
         const newMsg = message.duplicate(message.id.value + "-VERIFYBAR");
-        if (this.worker)
-            newMsg.workers.add(this.worker.duplicate());
+        newMsg.workers.add(new ODWorker("opendiscord:VERIFYBAR", 1000, async (msgInstance, msgParams, msgOrigin, msgCancel) => {
+            await this.workers.executeWorkers(msgInstance, origin, params);
+        }));
         return newMsg;
     }
-    /**Change the worker of this component modifier. */
-    setWorker(worker) {
-        this.worker = worker;
-    }
 }
 /**## ODMessageComponent `class`
  * A message builder with **components v2** support.

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@open-discord-bots/framework",
     "author": "DJj123dj",
-    "version": "0.3.11",
+    "version": "0.3.13",
     "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/main.ts

@@ -154,7 +154,7 @@ export abstract class ODMain implements ODMainManagers {
     constructor(managers:ODMainManagers,project:ODProjectType){
         this.project = project
         this.versions = managers.versions
-        this.versions.add(ODVersion.fromString("opendiscord:api","v0.3.11"))
+        this.versions.add(ODVersion.fromString("opendiscord:api","v0.3.13"))
         this.versions.add(ODVersion.fromString("opendiscord:livestatus","v2.0.0"))
 
         this.debugfile = managers.debugfile

package/src/api/modules/component.ts

@@ -101,7 +101,7 @@ export class ODBaseComponentManager<IdList extends ODComponentManagerIdConstrain
 /**## ODComponentModifierManagerIdConstraint `type`
  * The constraint/layout for id mappings/interfaces of the `ODComponentModifierManager` class.
  */
-export type ODComponentModifierManagerIdConstraint = Record<string,ODMessageComponentModifier<string,{}>>
+export type ODComponentModifierManagerIdConstraint = Record<string,ODMessageComponentModifier<string,{},string>>
 
 /**## ODComponentModifierManager `class`
  * An Open Discord component modifier manager.
@@ -110,22 +110,22 @@ export type ODComponentModifierManagerIdConstraint = Record<string,ODMessageComp
  * - Patch, modify, expand or update existing messages
  * - It Does not affect the original message (cloned)
  */
-export class ODComponentModifierManager<IdList extends ODComponentModifierManagerIdConstraint = ODComponentModifierManagerIdConstraint> extends ODManager<ODMessageComponentModifier<string,{}>> {
+export class ODComponentModifierManager<IdList extends ODComponentModifierManagerIdConstraint = ODComponentModifierManagerIdConstraint> extends ODManager<ODMessageComponentModifier<string,{},string>> {
     constructor(debug:ODDebugger){
         super(debug,"component modifier")
     }
     
     get<ModifierId extends keyof ODNoGeneric<IdList>>(id:ModifierId): IdList[ModifierId]
-    get(id:ODValidId): ODMessageComponentModifier<string,{}>|null
+    get(id:ODValidId): ODMessageComponentModifier<string,{},string>|null
     
-    get(id:ODValidId): ODMessageComponentModifier<string,{}>|null {
+    get(id:ODValidId): ODMessageComponentModifier<string,{},string>|null {
         return super.get(id)
     }
 
     remove<ModifierId extends keyof ODNoGeneric<IdList>>(id:ModifierId): IdList[ModifierId]
-    remove(id:ODValidId): ODMessageComponentModifier<string,{}>|null
+    remove(id:ODValidId): ODMessageComponentModifier<string,{},string>|null
     
-    remove(id:ODValidId): ODMessageComponentModifier<string,{}>|null {
+    remove(id:ODValidId): ODMessageComponentModifier<string,{},string>|null {
         return super.remove(id)
     }
 
@@ -433,25 +433,24 @@ export abstract class ODParentComponent<Data extends object,ChildComponent exten
  * 
  * Warning: If workers access external variables (outside parameters), the clone will still use those variables. This might result in unexpected behaviour!
  */
-export class ODMessageComponentModifier<Origin extends string,Params> extends ODManagerData {
-    /**The worker which will modify the message. */
-    worker: ODWorker<ODMessageInstance|ODComponentFactoryInstance<ODMessageComponent>,Origin,Params>|null
+export class ODMessageComponentModifier<Origin extends string,Params,WorkerIds extends string> extends ODManagerData {
+    /**The workers which will modify the message. */
+    workers: ODWorkerManager<ODMessageInstance|ODComponentFactoryInstance<ODMessageComponent>,Origin,Params,WorkerIds>
 
-    constructor(id:ODValidId,worker?:ODWorker<ODMessageInstance|ODComponentFactoryInstance<ODMessageComponent>,Origin,Params>){
+    constructor(id:ODValidId,callback?:ODWorkerCallback<ODMessageInstance|ODComponentFactoryInstance<ODMessageComponent>,Origin,Params>, priority?:number, callbackId?:ODValidId){
         super(id)
-        this.worker = worker ?? null
+        this.workers = new ODWorkerManager("ascending")
+        if (callback) this.workers.add(new ODWorker(callbackId ? callbackId : id,priority ?? 0,callback))
     }
 
-    /**Modify an `ODMessage` or `ODComponentFactory` with the worker. A copy will be returned and the original is preserved. */
-    modify<Message extends ODMessage<any,any,any>|ODComponentFactory<ODMessageComponent,any,any,any>>(message:Message): Message {
+    /**Modify an `ODMessage` or `ODComponentFactory` with these workers. A copy will be returned and the original is preserved. */
+    modify<Message extends ODMessage<any,any,any>|ODComponentFactory<ODMessageComponent,any,any,any>>(message:Message,origin:Origin,params:Params): Message {
         const newMsg = message.duplicate(message.id.value+"-VERIFYBAR") as Message
-        if (this.worker) newMsg.workers.add(this.worker.duplicate())
+        newMsg.workers.add(new ODWorker<any,any,any>("opendiscord:VERIFYBAR",1000,async (msgInstance,msgParams,msgOrigin,msgCancel) => {
+            await this.workers.executeWorkers(msgInstance,origin,params)
+        }))
         return newMsg
     }
-    /**Change the worker of this component modifier. */
-    setWorker(worker:ODWorker<ODMessageInstance|ODComponentFactoryInstance<ODMessageComponent>,Origin,Params>|null){
-        this.worker = worker
-    }
 }
 
 //////////////////////////////////////