@magicyan/discord 1.0.35 → 1.1.1

package/dist/constants/colors.cjs

@@ -0,0 +1,7 @@
+'use strict';
+
+const colors = {
+  embedbg: "#2B2D31"
+};
+
+exports.colors = colors;

package/dist/constants/colors.mjs

@@ -0,0 +1,5 @@
+const colors = {
+  embedbg: "#2B2D31"
+};
+
+export { colors };

package/dist/functions/embeds/embedplus.cjs

@@ -5,6 +5,7 @@ const assets = require('./assets.cjs');
 const fields = require('./fields.cjs');
 const footer = require('./footer.cjs');
 const chars = require('../../constants/chars.cjs');
+const colors = require('../../constants/colors.cjs');
 
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
@@ -62,7 +63,7 @@ class EmbedPlusBuilder extends discord_js.EmbedBuilder {
   }
   setBorderColor(color) {
     if (color === null) {
-      this.setColor("#2B2D31");
+      this.setColor(colors.colors.embedbg);
     } else if (typeof color === "number") {
       this.update({ color });
     } else {
@@ -100,17 +101,11 @@ class EmbedPlusBuilder extends discord_js.EmbedBuilder {
     }
     return this;
   }
-  static fromInteraction(interaction, index = 0, data = {}) {
-    return EmbedPlusBuilder.fromMessage(interaction.message, index, data);
-  }
-  static fromMessage(message, index = 0, data = {}) {
-    return new EmbedPlusBuilder(Object.assign({ extends: message.embeds[index] }, data));
-  }
 }
 function createEmbed(options) {
   const { array = false, from, fromIndex = 0, ...data } = options;
-  const embed = from ? "message" in from ? EmbedPlusBuilder.fromInteraction(from, fromIndex, data) : EmbedPlusBuilder.fromMessage(from, fromIndex, data) : new EmbedPlusBuilder(data);
-  return array ? [embed] : embed;
+  const fromEmbeds = from ? "message" in from ? from.message.embeds : from.embeds : [];
+  return array ? from && fromEmbeds.length > 0 ? fromEmbeds.map((embed) => new EmbedPlusBuilder({ extends: embed })) : [new EmbedPlusBuilder(data)] : from && fromEmbeds.length > 0 ? new EmbedPlusBuilder({ extends: fromEmbeds[fromIndex], ...data }) : new EmbedPlusBuilder(data);
 }
 
 exports.EmbedPlusBuilder = EmbedPlusBuilder;

package/dist/functions/embeds/embedplus.mjs

@@ -3,6 +3,7 @@ import { createEmbedAsset } from './assets.mjs';
 import { EmbedPlusFields } from './fields.mjs';
 import { createEmbedFooter } from './footer.mjs';
 import { chars } from '../../constants/chars.mjs';
+import { colors } from '../../constants/colors.mjs';
 
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
@@ -60,7 +61,7 @@ class EmbedPlusBuilder extends EmbedBuilder {
   }
   setBorderColor(color) {
     if (color === null) {
-      this.setColor("#2B2D31");
+      this.setColor(colors.embedbg);
     } else if (typeof color === "number") {
       this.update({ color });
     } else {
@@ -98,17 +99,11 @@ class EmbedPlusBuilder extends EmbedBuilder {
     }
     return this;
   }
-  static fromInteraction(interaction, index = 0, data = {}) {
-    return EmbedPlusBuilder.fromMessage(interaction.message, index, data);
-  }
-  static fromMessage(message, index = 0, data = {}) {
-    return new EmbedPlusBuilder(Object.assign({ extends: message.embeds[index] }, data));
-  }
 }
 function createEmbed(options) {
   const { array = false, from, fromIndex = 0, ...data } = options;
-  const embed = from ? "message" in from ? EmbedPlusBuilder.fromInteraction(from, fromIndex, data) : EmbedPlusBuilder.fromMessage(from, fromIndex, data) : new EmbedPlusBuilder(data);
-  return array ? [embed] : embed;
+  const fromEmbeds = from ? "message" in from ? from.message.embeds : from.embeds : [];
+  return array ? from && fromEmbeds.length > 0 ? fromEmbeds.map((embed) => new EmbedPlusBuilder({ extends: embed })) : [new EmbedPlusBuilder(data)] : from && fromEmbeds.length > 0 ? new EmbedPlusBuilder({ extends: fromEmbeds[fromIndex], ...data }) : new EmbedPlusBuilder(data);
 }
 
 export { EmbedPlusBuilder, createEmbed };

package/dist/functions/embeds/fields.cjs

@@ -51,9 +51,14 @@ class EmbedPlusFields {
   }
   push(...fields) {
     this.embed.addFields(fields.map(this.fieldFormat));
+    return this;
   }
   set(...fields) {
     this.embed.setFields(fields.map(this.fieldFormat));
+    return this;
+  }
+  insert(index, ...fields) {
+    this.fields.splice(index, 0, ...fields.map(this.fieldFormat));
   }
   map(callback) {
     return this.toArray().map(callback);

package/dist/functions/embeds/fields.mjs

@@ -49,9 +49,14 @@ class EmbedPlusFields {
   }
   push(...fields) {
     this.embed.addFields(fields.map(this.fieldFormat));
+    return this;
   }
   set(...fields) {
     this.embed.setFields(fields.map(this.fieldFormat));
+    return this;
+  }
+  insert(index, ...fields) {
+    this.fields.splice(index, 0, ...fields.map(this.fieldFormat));
   }
   map(callback) {
     return this.toArray().map(callback);

package/dist/index.d.cts

@@ -77,8 +77,9 @@ declare class EmbedPlusFields {
      */
     get(index: number): EmbedPlusFieldData | undefined;
     find(predicate: FieldPredicate): EmbedPlusFieldData | undefined;
-    push(...fields: Partial<EmbedPlusFieldData>[]): void;
-    set(...fields: Partial<EmbedPlusFieldData>[]): void;
+    push(...fields: Partial<EmbedPlusFieldData>[]): this;
+    set(...fields: Partial<EmbedPlusFieldData>[]): this;
+    insert(index: number, ...fields: Partial<EmbedPlusFieldData>[]): void;
     map<U>(callback: (value: EmbedPlusFieldData, index: number, array: EmbedPlusFieldData[]) => U): U[];
     update(predicate: string | number | FieldPredicate, field: Partial<EmbedPlusFieldData>): boolean;
     delete(predicate: string | number | FieldPredicate): boolean;
@@ -97,6 +98,7 @@ type EmbedPlusFooterData = {
 };
 declare function createEmbedFooter(options: EmbedPlusFooterData): EmbedFooterData | undefined;
 
+type EmbedPlusBuilderReturn<B> = undefined extends B ? EmbedPlusBuilder : false extends B ? EmbedPlusBuilder : EmbedPlusBuilder[];
 type EmbedPlusColorData = string & {} | ColorResolvable | null;
 type EmbedPlusAuthorData = {
     name: string;
@@ -139,8 +141,6 @@ declare class EmbedPlusBuilder extends EmbedBuilder {
     setBorderColor(color: EmbedPlusColorData | null): this;
     setAsset(asset: "thumbnail" | "image", source: EmbedPlusAssetData): this;
     setElementImageURL(element: "thumbnail" | "image" | "author" | "footer", url: string | null): this;
-    static fromInteraction(interaction: InteractionWithEmbeds, index?: number, data?: EmbedPlusData): EmbedPlusBuilder;
-    static fromMessage(message: MessageWithEmbeds, index?: number, data?: EmbedPlusData): EmbedPlusBuilder;
 }
 type EmbedPlusProperty<P extends keyof EmbedPlusData> = EmbedPlusData[P];
 interface CreateEmbedOptions<B extends boolean> extends EmbedPlusOptions {
@@ -148,8 +148,7 @@ interface CreateEmbedOptions<B extends boolean> extends EmbedPlusOptions {
     from?: InteractionWithEmbeds | MessageWithEmbeds;
     fromIndex?: number;
 }
-type CreateEmbedReturn<B> = undefined extends B ? EmbedPlusBuilder : false extends B ? EmbedPlusBuilder : EmbedPlusBuilder[];
-declare function createEmbed<B extends boolean>(options: CreateEmbedOptions<B>): CreateEmbedReturn<B>;
+declare function createEmbed<B extends boolean>(options: CreateEmbedOptions<B>): EmbedPlusBuilderReturn<B>;
 
 type ImageFileExtention = "png" | "jpg" | "gif" | "webp";
 type ImageElementProperty = "author" | "thumbnail" | "image" | "footer";

package/dist/index.d.mts

@@ -77,8 +77,9 @@ declare class EmbedPlusFields {
      */
     get(index: number): EmbedPlusFieldData | undefined;
     find(predicate: FieldPredicate): EmbedPlusFieldData | undefined;
-    push(...fields: Partial<EmbedPlusFieldData>[]): void;
-    set(...fields: Partial<EmbedPlusFieldData>[]): void;
+    push(...fields: Partial<EmbedPlusFieldData>[]): this;
+    set(...fields: Partial<EmbedPlusFieldData>[]): this;
+    insert(index: number, ...fields: Partial<EmbedPlusFieldData>[]): void;
     map<U>(callback: (value: EmbedPlusFieldData, index: number, array: EmbedPlusFieldData[]) => U): U[];
     update(predicate: string | number | FieldPredicate, field: Partial<EmbedPlusFieldData>): boolean;
     delete(predicate: string | number | FieldPredicate): boolean;
@@ -97,6 +98,7 @@ type EmbedPlusFooterData = {
 };
 declare function createEmbedFooter(options: EmbedPlusFooterData): EmbedFooterData | undefined;
 
+type EmbedPlusBuilderReturn<B> = undefined extends B ? EmbedPlusBuilder : false extends B ? EmbedPlusBuilder : EmbedPlusBuilder[];
 type EmbedPlusColorData = string & {} | ColorResolvable | null;
 type EmbedPlusAuthorData = {
     name: string;
@@ -139,8 +141,6 @@ declare class EmbedPlusBuilder extends EmbedBuilder {
     setBorderColor(color: EmbedPlusColorData | null): this;
     setAsset(asset: "thumbnail" | "image", source: EmbedPlusAssetData): this;
     setElementImageURL(element: "thumbnail" | "image" | "author" | "footer", url: string | null): this;
-    static fromInteraction(interaction: InteractionWithEmbeds, index?: number, data?: EmbedPlusData): EmbedPlusBuilder;
-    static fromMessage(message: MessageWithEmbeds, index?: number, data?: EmbedPlusData): EmbedPlusBuilder;
 }
 type EmbedPlusProperty<P extends keyof EmbedPlusData> = EmbedPlusData[P];
 interface CreateEmbedOptions<B extends boolean> extends EmbedPlusOptions {
@@ -148,8 +148,7 @@ interface CreateEmbedOptions<B extends boolean> extends EmbedPlusOptions {
     from?: InteractionWithEmbeds | MessageWithEmbeds;
     fromIndex?: number;
 }
-type CreateEmbedReturn<B> = undefined extends B ? EmbedPlusBuilder : false extends B ? EmbedPlusBuilder : EmbedPlusBuilder[];
-declare function createEmbed<B extends boolean>(options: CreateEmbedOptions<B>): CreateEmbedReturn<B>;
+declare function createEmbed<B extends boolean>(options: CreateEmbedOptions<B>): EmbedPlusBuilderReturn<B>;
 
 type ImageFileExtention = "png" | "jpg" | "gif" | "webp";
 type ImageElementProperty = "author" | "thumbnail" | "image" | "footer";

package/dist/index.d.ts

@@ -77,8 +77,9 @@ declare class EmbedPlusFields {
      */
     get(index: number): EmbedPlusFieldData | undefined;
     find(predicate: FieldPredicate): EmbedPlusFieldData | undefined;
-    push(...fields: Partial<EmbedPlusFieldData>[]): void;
-    set(...fields: Partial<EmbedPlusFieldData>[]): void;
+    push(...fields: Partial<EmbedPlusFieldData>[]): this;
+    set(...fields: Partial<EmbedPlusFieldData>[]): this;
+    insert(index: number, ...fields: Partial<EmbedPlusFieldData>[]): void;
     map<U>(callback: (value: EmbedPlusFieldData, index: number, array: EmbedPlusFieldData[]) => U): U[];
     update(predicate: string | number | FieldPredicate, field: Partial<EmbedPlusFieldData>): boolean;
     delete(predicate: string | number | FieldPredicate): boolean;
@@ -97,6 +98,7 @@ type EmbedPlusFooterData = {
 };
 declare function createEmbedFooter(options: EmbedPlusFooterData): EmbedFooterData | undefined;
 
+type EmbedPlusBuilderReturn<B> = undefined extends B ? EmbedPlusBuilder : false extends B ? EmbedPlusBuilder : EmbedPlusBuilder[];
 type EmbedPlusColorData = string & {} | ColorResolvable | null;
 type EmbedPlusAuthorData = {
     name: string;
@@ -139,8 +141,6 @@ declare class EmbedPlusBuilder extends EmbedBuilder {
     setBorderColor(color: EmbedPlusColorData | null): this;
     setAsset(asset: "thumbnail" | "image", source: EmbedPlusAssetData): this;
     setElementImageURL(element: "thumbnail" | "image" | "author" | "footer", url: string | null): this;
-    static fromInteraction(interaction: InteractionWithEmbeds, index?: number, data?: EmbedPlusData): EmbedPlusBuilder;
-    static fromMessage(message: MessageWithEmbeds, index?: number, data?: EmbedPlusData): EmbedPlusBuilder;
 }
 type EmbedPlusProperty<P extends keyof EmbedPlusData> = EmbedPlusData[P];
 interface CreateEmbedOptions<B extends boolean> extends EmbedPlusOptions {
@@ -148,8 +148,7 @@ interface CreateEmbedOptions<B extends boolean> extends EmbedPlusOptions {
     from?: InteractionWithEmbeds | MessageWithEmbeds;
     fromIndex?: number;
 }
-type CreateEmbedReturn<B> = undefined extends B ? EmbedPlusBuilder : false extends B ? EmbedPlusBuilder : EmbedPlusBuilder[];
-declare function createEmbed<B extends boolean>(options: CreateEmbedOptions<B>): CreateEmbedReturn<B>;
+declare function createEmbed<B extends boolean>(options: CreateEmbedOptions<B>): EmbedPlusBuilderReturn<B>;
 
 type ImageFileExtention = "png" | "jpg" | "gif" | "webp";
 type ImageElementProperty = "author" | "thumbnail" | "image" | "footer";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magicyan/discord",
-  "version": "1.0.35",
+  "version": "1.1.1",
   "description": "Simple functions to facilitate discord bot development",
   "license": "MIT",
   "type": "module",