@magicyan/discord 1.0.32 → 1.0.34

package/dist/functions/embeds/embedplus.cjs

@@ -22,6 +22,8 @@ class EmbedPlusBuilder extends discord_js.EmbedBuilder {
       field.inline !== void 0 ? { inline: field.inline } : {}
     ));
     const builderData = Object.assign({}, extendsData, embedData, { fields: fields$1 });
+    if (builderData.url)
+      builderData.url = builderData.url.toString();
     const { color, footer: footer$1, image, thumbnail, timestamp } = embedData;
     if (footer$1)
       Object.assign(builderData, { footer: footer.createEmbedFooter(footer$1) });

package/dist/functions/embeds/embedplus.mjs

@@ -20,6 +20,8 @@ class EmbedPlusBuilder extends EmbedBuilder {
       field.inline !== void 0 ? { inline: field.inline } : {}
     ));
     const builderData = Object.assign({}, extendsData, embedData, { fields });
+    if (builderData.url)
+      builderData.url = builderData.url.toString();
     const { color, footer, image, thumbnail, timestamp } = embedData;
     if (footer)
       Object.assign(builderData, { footer: createEmbedFooter(footer) });

package/dist/functions/embeds/fields.cjs

@@ -1,5 +1,7 @@
 'use strict';
 
+const chars = require('../../constants/chars.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;
 var __publicField = (obj, key, value) => {
@@ -48,10 +50,10 @@ class EmbedPlusFields {
     return this.fields.find(predicate);
   }
   push(...fields) {
-    this.embed.addFields(fields);
+    this.embed.addFields(fields.map(this.fieldFormat));
   }
   set(...fields) {
-    this.embed.setFields(fields);
+    this.embed.setFields(fields.map(this.fieldFormat));
   }
   map(callback) {
     return this.toArray().map(callback);
@@ -98,6 +100,12 @@ class EmbedPlusFields {
         return -1;
     }
   }
+  fieldFormat(field) {
+    return Object.assign(
+      { name: field.name ?? chars.chars.invisible, value: field.value ?? chars.chars.invisible },
+      field.inline !== void 0 ? { inline: field.inline } : {}
+    );
+  }
 }
 
 exports.EmbedPlusFields = EmbedPlusFields;

package/dist/functions/embeds/fields.mjs

@@ -1,3 +1,5 @@
+import { chars } from '../../constants/chars.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;
 var __publicField = (obj, key, value) => {
@@ -46,10 +48,10 @@ class EmbedPlusFields {
     return this.fields.find(predicate);
   }
   push(...fields) {
-    this.embed.addFields(fields);
+    this.embed.addFields(fields.map(this.fieldFormat));
   }
   set(...fields) {
-    this.embed.setFields(fields);
+    this.embed.setFields(fields.map(this.fieldFormat));
   }
   map(callback) {
     return this.toArray().map(callback);
@@ -96,6 +98,12 @@ class EmbedPlusFields {
         return -1;
     }
   }
+  fieldFormat(field) {
+    return Object.assign(
+      { name: field.name ?? chars.invisible, value: field.value ?? chars.invisible },
+      field.inline !== void 0 ? { inline: field.inline } : {}
+    );
+  }
 }
 
 export { EmbedPlusFields };

package/dist/functions/embeds/files.cjs

@@ -9,19 +9,19 @@ function createEmbedFiles(embed, options) {
     files.push(new discord_js.AttachmentBuilder(url, { name: `${name}.${ext}` }));
     return `attachment://${name}.${ext}`;
   };
-  if (thumbnail?.url) {
+  if (thumbnail?.url && !options?.ignore?.includes("thumbnail")) {
     const url = handle(thumbnail.url, "thumbnail", options?.extentions?.thumbnail);
     embed.setThumbnail(url);
   }
-  if (image?.url) {
+  if (image?.url && !options?.ignore?.includes("image")) {
     const url = handle(image.url, "image", options?.extentions?.image);
     embed.setImage(url);
   }
-  if (author?.icon_url) {
+  if (author?.icon_url && !options?.ignore?.includes("author")) {
     const url = handle(author?.icon_url, "author", options?.extentions?.author);
     embed.setAuthor({ name: author.name, iconURL: url, url: author.url });
   }
-  if (footer?.icon_url) {
+  if (footer?.icon_url && !options?.ignore?.includes("footer")) {
     const url = handle(footer.icon_url, "footer", options?.extentions?.footer);
     embed.setFooter({ text: footer.text, iconURL: url });
   }

package/dist/functions/embeds/files.mjs

@@ -7,19 +7,19 @@ function createEmbedFiles(embed, options) {
     files.push(new AttachmentBuilder(url, { name: `${name}.${ext}` }));
     return `attachment://${name}.${ext}`;
   };
-  if (thumbnail?.url) {
+  if (thumbnail?.url && !options?.ignore?.includes("thumbnail")) {
     const url = handle(thumbnail.url, "thumbnail", options?.extentions?.thumbnail);
     embed.setThumbnail(url);
   }
-  if (image?.url) {
+  if (image?.url && !options?.ignore?.includes("image")) {
     const url = handle(image.url, "image", options?.extentions?.image);
     embed.setImage(url);
   }
-  if (author?.icon_url) {
+  if (author?.icon_url && !options?.ignore?.includes("author")) {
     const url = handle(author?.icon_url, "author", options?.extentions?.author);
     embed.setAuthor({ name: author.name, iconURL: url, url: author.url });
   }
-  if (footer?.icon_url) {
+  if (footer?.icon_url && !options?.ignore?.includes("footer")) {
     const url = handle(footer.icon_url, "footer", options?.extentions?.footer);
     embed.setFooter({ text: footer.text, iconURL: url });
   }

package/dist/functions/modals.cjs

@@ -4,6 +4,7 @@ const discord_js = require('discord.js');
 const components = require('./components.cjs');
 
 function createModalInput(data) {
+  data.style ?? (data.style = discord_js.TextInputStyle.Short);
   return components.createRow(new discord_js.TextInputBuilder(data));
 }
 function createModalFields(data) {

package/dist/functions/modals.mjs

@@ -1,7 +1,8 @@
-import { TextInputBuilder } from 'discord.js';
+import { TextInputStyle, TextInputBuilder } from 'discord.js';
 import { createRow } from './components.mjs';
 
 function createModalInput(data) {
+  data.style ?? (data.style = TextInputStyle.Short);
   return createRow(new TextInputBuilder(data));
 }
 function createModalFields(data) {

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import * as discord_js from 'discord.js';
-import { GatewayIntentBits, Partials, Attachment, AttachmentBuilder, EmbedAssetData, Guild, GuildMember, User, ClientUser, ImageURLOptions, EmbedFooterData, ColorResolvable, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, AnyComponentBuilder, ActionRowBuilder, ButtonBuilder, LinkButtonComponentData, ChannelType, CommandInteractionOption, Client, ApplicationCommand, ApplicationCommandOptionData, ApplicationCommandSubCommandData, ApplicationCommandSubGroupData, TextInputBuilder, ModalSubmitFields, Collection, TextInputComponent, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role } from 'discord.js';
+import { GatewayIntentBits, Partials, Attachment, AttachmentBuilder, EmbedAssetData, Guild, GuildMember, User, ClientUser, ImageURLOptions, EmbedFooterData, ColorResolvable, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, AnyComponentBuilder, ActionRowBuilder, ButtonBuilder, LinkButtonComponentData, ChannelType, CommandInteractionOption, Client, ApplicationCommand, ApplicationCommandOptionData, ApplicationCommandSubCommandData, ApplicationCommandSubGroupData, TextInputBuilder, ModalSubmitFields, Collection, TextInputComponent, TextInputStyle, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role } from 'discord.js';
 export * from '@magicyan/core';
 
 declare const chars: {
@@ -77,8 +77,8 @@ declare class EmbedPlusFields {
      */
     get(index: number): EmbedPlusFieldData | undefined;
     find(predicate: FieldPredicate): EmbedPlusFieldData | undefined;
-    push(...fields: EmbedPlusFieldData[]): void;
-    set(...fields: EmbedPlusFieldData[]): void;
+    push(...fields: Partial<EmbedPlusFieldData>[]): void;
+    set(...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;
@@ -88,6 +88,7 @@ declare class EmbedPlusFields {
     clear(): this;
     toArray(): EmbedPlusFieldData[];
     private getPredicateIndex;
+    private fieldFormat;
 }
 
 type EmbedPlusFooterData = {
@@ -106,7 +107,9 @@ interface EmbedPlusData {
     title?: string | null;
     color?: EmbedPlusColorData | null;
     description?: string | null;
-    url?: string | null;
+    url?: string | null | {
+        toString(): string;
+    };
     thumbnail?: EmbedPlusAssetData;
     image?: EmbedPlusAssetData;
     fields?: Partial<EmbedPlusFieldData>[] | null;
@@ -151,13 +154,13 @@ declare function createEmbed<B extends boolean>(options: CreateEmbedOptions<B>):
 type ImageFileExtention = "png" | "jpg" | "gif" | "webp";
 type ImageElementProperty = "author" | "thumbnail" | "image" | "footer";
 interface CreateEmbedFilesOptions {
+    ignore?: ImageElementProperty[];
     extentions?: Record<ImageElementProperty, ImageFileExtention>;
 }
 /**
- *
  * Turns any embed image url into an attachment and returns an attachment array
  */
-declare function createEmbedFiles(embed: EmbedPlusBuilder, options?: CreateEmbedFilesOptions): AttachmentBuilder[];
+declare function createEmbedFiles(embed: EmbedBuilder, options?: CreateEmbedFilesOptions): AttachmentBuilder[];
 
 declare function createRow<Component extends AnyComponentBuilder>(...components: Component[]): ActionRowBuilder<Component>;
 interface CreateLinkButtonData extends Omit<LinkButtonComponentData, "style" | "type"> {
@@ -233,9 +236,13 @@ type SubCommandGroups = Record<string, SubCommandGroup>;
 declare function createSubCommandsGroups(groups: SubCommandGroups): ApplicationCommandSubGroupData[];
 
 type TextInputData = Omit<TextInputComponentData, "type">;
-type CreateModalInputData = TextInputData;
-declare function createModalInput(data: CreateModalInputData): ActionRowBuilder<TextInputBuilder>;
-type ModalFieldsData = Record<string, Omit<TextInputData, "customId">>;
+interface ModalFieldData extends Omit<TextInputData, "customId" | "style"> {
+    style?: TextInputStyle;
+}
+declare function createModalInput(data: ModalFieldData & {
+    customId: string;
+}): ActionRowBuilder<TextInputBuilder>;
+type ModalFieldsData = Record<string, ModalFieldData>;
 declare function createModalFields(data: ModalFieldsData): ActionRowBuilder<TextInputBuilder>[];
 type ModalFieldsRecord<K extends string> = Record<K, string>;
 declare function modalFieldsToRecord<K extends string = string>(fields: ModalSubmitFields | Collection<string, TextInputComponent>): ModalFieldsRecord<K>;

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import * as discord_js from 'discord.js';
-import { GatewayIntentBits, Partials, Attachment, AttachmentBuilder, EmbedAssetData, Guild, GuildMember, User, ClientUser, ImageURLOptions, EmbedFooterData, ColorResolvable, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, AnyComponentBuilder, ActionRowBuilder, ButtonBuilder, LinkButtonComponentData, ChannelType, CommandInteractionOption, Client, ApplicationCommand, ApplicationCommandOptionData, ApplicationCommandSubCommandData, ApplicationCommandSubGroupData, TextInputBuilder, ModalSubmitFields, Collection, TextInputComponent, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role } from 'discord.js';
+import { GatewayIntentBits, Partials, Attachment, AttachmentBuilder, EmbedAssetData, Guild, GuildMember, User, ClientUser, ImageURLOptions, EmbedFooterData, ColorResolvable, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, AnyComponentBuilder, ActionRowBuilder, ButtonBuilder, LinkButtonComponentData, ChannelType, CommandInteractionOption, Client, ApplicationCommand, ApplicationCommandOptionData, ApplicationCommandSubCommandData, ApplicationCommandSubGroupData, TextInputBuilder, ModalSubmitFields, Collection, TextInputComponent, TextInputStyle, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role } from 'discord.js';
 export * from '@magicyan/core';
 
 declare const chars: {
@@ -77,8 +77,8 @@ declare class EmbedPlusFields {
      */
     get(index: number): EmbedPlusFieldData | undefined;
     find(predicate: FieldPredicate): EmbedPlusFieldData | undefined;
-    push(...fields: EmbedPlusFieldData[]): void;
-    set(...fields: EmbedPlusFieldData[]): void;
+    push(...fields: Partial<EmbedPlusFieldData>[]): void;
+    set(...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;
@@ -88,6 +88,7 @@ declare class EmbedPlusFields {
     clear(): this;
     toArray(): EmbedPlusFieldData[];
     private getPredicateIndex;
+    private fieldFormat;
 }
 
 type EmbedPlusFooterData = {
@@ -106,7 +107,9 @@ interface EmbedPlusData {
     title?: string | null;
     color?: EmbedPlusColorData | null;
     description?: string | null;
-    url?: string | null;
+    url?: string | null | {
+        toString(): string;
+    };
     thumbnail?: EmbedPlusAssetData;
     image?: EmbedPlusAssetData;
     fields?: Partial<EmbedPlusFieldData>[] | null;
@@ -151,13 +154,13 @@ declare function createEmbed<B extends boolean>(options: CreateEmbedOptions<B>):
 type ImageFileExtention = "png" | "jpg" | "gif" | "webp";
 type ImageElementProperty = "author" | "thumbnail" | "image" | "footer";
 interface CreateEmbedFilesOptions {
+    ignore?: ImageElementProperty[];
     extentions?: Record<ImageElementProperty, ImageFileExtention>;
 }
 /**
- *
  * Turns any embed image url into an attachment and returns an attachment array
  */
-declare function createEmbedFiles(embed: EmbedPlusBuilder, options?: CreateEmbedFilesOptions): AttachmentBuilder[];
+declare function createEmbedFiles(embed: EmbedBuilder, options?: CreateEmbedFilesOptions): AttachmentBuilder[];
 
 declare function createRow<Component extends AnyComponentBuilder>(...components: Component[]): ActionRowBuilder<Component>;
 interface CreateLinkButtonData extends Omit<LinkButtonComponentData, "style" | "type"> {
@@ -233,9 +236,13 @@ type SubCommandGroups = Record<string, SubCommandGroup>;
 declare function createSubCommandsGroups(groups: SubCommandGroups): ApplicationCommandSubGroupData[];
 
 type TextInputData = Omit<TextInputComponentData, "type">;
-type CreateModalInputData = TextInputData;
-declare function createModalInput(data: CreateModalInputData): ActionRowBuilder<TextInputBuilder>;
-type ModalFieldsData = Record<string, Omit<TextInputData, "customId">>;
+interface ModalFieldData extends Omit<TextInputData, "customId" | "style"> {
+    style?: TextInputStyle;
+}
+declare function createModalInput(data: ModalFieldData & {
+    customId: string;
+}): ActionRowBuilder<TextInputBuilder>;
+type ModalFieldsData = Record<string, ModalFieldData>;
 declare function createModalFields(data: ModalFieldsData): ActionRowBuilder<TextInputBuilder>[];
 type ModalFieldsRecord<K extends string> = Record<K, string>;
 declare function modalFieldsToRecord<K extends string = string>(fields: ModalSubmitFields | Collection<string, TextInputComponent>): ModalFieldsRecord<K>;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as discord_js from 'discord.js';
-import { GatewayIntentBits, Partials, Attachment, AttachmentBuilder, EmbedAssetData, Guild, GuildMember, User, ClientUser, ImageURLOptions, EmbedFooterData, ColorResolvable, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, AnyComponentBuilder, ActionRowBuilder, ButtonBuilder, LinkButtonComponentData, ChannelType, CommandInteractionOption, Client, ApplicationCommand, ApplicationCommandOptionData, ApplicationCommandSubCommandData, ApplicationCommandSubGroupData, TextInputBuilder, ModalSubmitFields, Collection, TextInputComponent, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role } from 'discord.js';
+import { GatewayIntentBits, Partials, Attachment, AttachmentBuilder, EmbedAssetData, Guild, GuildMember, User, ClientUser, ImageURLOptions, EmbedFooterData, ColorResolvable, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, AnyComponentBuilder, ActionRowBuilder, ButtonBuilder, LinkButtonComponentData, ChannelType, CommandInteractionOption, Client, ApplicationCommand, ApplicationCommandOptionData, ApplicationCommandSubCommandData, ApplicationCommandSubGroupData, TextInputBuilder, ModalSubmitFields, Collection, TextInputComponent, TextInputStyle, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role } from 'discord.js';
 export * from '@magicyan/core';
 
 declare const chars: {
@@ -77,8 +77,8 @@ declare class EmbedPlusFields {
      */
     get(index: number): EmbedPlusFieldData | undefined;
     find(predicate: FieldPredicate): EmbedPlusFieldData | undefined;
-    push(...fields: EmbedPlusFieldData[]): void;
-    set(...fields: EmbedPlusFieldData[]): void;
+    push(...fields: Partial<EmbedPlusFieldData>[]): void;
+    set(...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;
@@ -88,6 +88,7 @@ declare class EmbedPlusFields {
     clear(): this;
     toArray(): EmbedPlusFieldData[];
     private getPredicateIndex;
+    private fieldFormat;
 }
 
 type EmbedPlusFooterData = {
@@ -106,7 +107,9 @@ interface EmbedPlusData {
     title?: string | null;
     color?: EmbedPlusColorData | null;
     description?: string | null;
-    url?: string | null;
+    url?: string | null | {
+        toString(): string;
+    };
     thumbnail?: EmbedPlusAssetData;
     image?: EmbedPlusAssetData;
     fields?: Partial<EmbedPlusFieldData>[] | null;
@@ -151,13 +154,13 @@ declare function createEmbed<B extends boolean>(options: CreateEmbedOptions<B>):
 type ImageFileExtention = "png" | "jpg" | "gif" | "webp";
 type ImageElementProperty = "author" | "thumbnail" | "image" | "footer";
 interface CreateEmbedFilesOptions {
+    ignore?: ImageElementProperty[];
     extentions?: Record<ImageElementProperty, ImageFileExtention>;
 }
 /**
- *
  * Turns any embed image url into an attachment and returns an attachment array
  */
-declare function createEmbedFiles(embed: EmbedPlusBuilder, options?: CreateEmbedFilesOptions): AttachmentBuilder[];
+declare function createEmbedFiles(embed: EmbedBuilder, options?: CreateEmbedFilesOptions): AttachmentBuilder[];
 
 declare function createRow<Component extends AnyComponentBuilder>(...components: Component[]): ActionRowBuilder<Component>;
 interface CreateLinkButtonData extends Omit<LinkButtonComponentData, "style" | "type"> {
@@ -233,9 +236,13 @@ type SubCommandGroups = Record<string, SubCommandGroup>;
 declare function createSubCommandsGroups(groups: SubCommandGroups): ApplicationCommandSubGroupData[];
 
 type TextInputData = Omit<TextInputComponentData, "type">;
-type CreateModalInputData = TextInputData;
-declare function createModalInput(data: CreateModalInputData): ActionRowBuilder<TextInputBuilder>;
-type ModalFieldsData = Record<string, Omit<TextInputData, "customId">>;
+interface ModalFieldData extends Omit<TextInputData, "customId" | "style"> {
+    style?: TextInputStyle;
+}
+declare function createModalInput(data: ModalFieldData & {
+    customId: string;
+}): ActionRowBuilder<TextInputBuilder>;
+type ModalFieldsData = Record<string, ModalFieldData>;
 declare function createModalFields(data: ModalFieldsData): ActionRowBuilder<TextInputBuilder>[];
 type ModalFieldsRecord<K extends string> = Record<K, string>;
 declare function modalFieldsToRecord<K extends string = string>(fields: ModalSubmitFields | Collection<string, TextInputComponent>): ModalFieldsRecord<K>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magicyan/discord",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "description": "Simple functions to facilitate discord bot development",
   "license": "MIT",
   "type": "module",
@@ -44,4 +44,4 @@
   "peerDependencies": {
     "discord.js": "^14.15.2"
   }
-}
+}