@magicyan/discord 1.4.10 → 1.5.0

package/dist/functions/components/buttons.cjs

@@ -3,7 +3,16 @@
 const discord_js = require('discord.js');
 const row = require('./row.cjs');
 
-function createLinkButton(data) {
+function createLinkButton(data, label, emoji) {
+  if (typeof data === "string") {
+    label ?? (label = data);
+    return new discord_js.ButtonBuilder({
+      style: discord_js.ButtonStyle.Link,
+      label,
+      url: data,
+      emoji
+    });
+  }
   data.label ?? (data.label = data.url);
   return new discord_js.ButtonBuilder({ style: discord_js.ButtonStyle.Link, ...data });
 }

package/dist/functions/components/buttons.mjs

@@ -1,7 +1,16 @@
 import { ButtonBuilder, ButtonStyle } from 'discord.js';
 import { createRow } from './row.mjs';
 
-function createLinkButton(data) {
+function createLinkButton(data, label, emoji) {
+  if (typeof data === "string") {
+    label ?? (label = data);
+    return new ButtonBuilder({
+      style: ButtonStyle.Link,
+      label,
+      url: data,
+      emoji
+    });
+  }
   data.label ?? (data.label = data.url);
   return new ButtonBuilder({ style: ButtonStyle.Link, ...data });
 }

package/dist/functions/components/components.cjs

@@ -1,21 +1,18 @@
 'use strict';
 
+const core = require('@magicyan/core');
 const attachment = require('../../guards/attachment.cjs');
-const button = require('../../guards/button.cjs');
-const selectmenu = require('../../guards/selectmenu.cjs');
+const button = require('../../guards/components/button.cjs');
+const selectmenu = require('../../guards/components/selectmenu.cjs');
 const gallery = require('./gallery.cjs');
 const row = require('./row.cjs');
 const text = require('./text.cjs');
-const core = require('@magicyan/core');
 
 function createComponents(...data) {
   return data.flat().filter((value) => core.isDefined(value)).filter((value) => typeof value !== "boolean").map((component) => {
     if (typeof component === "string") {
       return text.createTextDisplay(component);
     }
-    if (Array.isArray(component)) {
-      return row.createRow(...component);
-    }
     if (selectmenu.isAnySelectMenuBuilder(component)) {
       return row.createRow(component);
     }

package/dist/functions/components/components.mjs

@@ -1,19 +1,16 @@
+import { isDefined } from '@magicyan/core';
 import { isAttachment } from '../../guards/attachment.mjs';
-import { isButtonBuilder } from '../../guards/button.mjs';
-import { isAnySelectMenuBuilder } from '../../guards/selectmenu.mjs';
+import { isButtonBuilder } from '../../guards/components/button.mjs';
+import { isAnySelectMenuBuilder } from '../../guards/components/selectmenu.mjs';
 import { createMediaGallery } from './gallery.mjs';
 import { createRow } from './row.mjs';
 import { createTextDisplay } from './text.mjs';
-import { isDefined } from '@magicyan/core';
 
 function createComponents(...data) {
   return data.flat().filter((value) => isDefined(value)).filter((value) => typeof value !== "boolean").map((component) => {
     if (typeof component === "string") {
       return createTextDisplay(component);
     }
-    if (Array.isArray(component)) {
-      return createRow(...component);
-    }
     if (isAnySelectMenuBuilder(component)) {
       return createRow(component);
     }

package/dist/functions/components/container.cjs

@@ -1,79 +1,84 @@
 'use strict';
 
+const core = require('@magicyan/core');
 const discord_js = require('discord.js');
-const attachment = require('../../guards/attachment.cjs');
-const selectmenu = require('../../guards/selectmenu.cjs');
-const gallery = require('./gallery.cjs');
-const row = require('./row.cjs');
-const text = require('./text.cjs');
+const components = require('./components.cjs');
+const message = require('../../guards/message.cjs');
 
-function createContainer(data, ...items) {
-  const container = new discord_js.ContainerBuilder();
-  const addComponent = (component) => {
-    if (!component)
-      return;
-    if (typeof component === "string") {
-      container.addTextDisplayComponents(
-        text.createTextDisplay(component)
-      );
-    }
-    if (component instanceof discord_js.TextDisplayBuilder) {
-      container.addTextDisplayComponents(
-        component
-      );
-    }
-    if (component instanceof discord_js.ActionRowBuilder) {
-      container.addActionRowComponents(component);
-    }
-    if (Array.isArray(component)) {
-      container.addActionRowComponents(
-        row.createRow(...component)
+class ContainerPlusBuilder extends discord_js.ContainerBuilder {
+  constructor(data) {
+    const constructorData = core.isDefined(data?.from) ? message.isMessage(data.from) ? data.from.components.filter((v) => v.type === discord_js.ComponentType.Container).at(data.fromIndex ?? 0)?.toJSON() ?? {} : data.from.toJSON() : {};
+    if (core.isDefined(data?.accentColor)) {
+      constructorData.accent_color = discord_js.resolveColor(
+        data.accentColor
       );
     }
-    if (selectmenu.isAnySelectMenuBuilder(component) || component instanceof discord_js.ButtonBuilder) {
-      container.addActionRowComponents(
-        row.createRow(component)
+    super(constructorData);
+    if (core.isDefined(data?.components) && data.components.length >= 1) {
+      this.spliceComponents(
+        0,
+        0,
+        ...components.createComponents(data.components)
       );
     }
-    if (component instanceof discord_js.SectionBuilder) {
-      container.addSectionComponents(component);
-    }
-    if (component instanceof discord_js.FileBuilder) {
-      container.addFileComponents(component);
-    }
-    if (component instanceof discord_js.MediaGalleryBuilder) {
-      container.addMediaGalleryComponents(component);
-    }
-    if (attachment.isAttachment(component)) {
-      container.addMediaGalleryComponents(
-        gallery.createMediaGallery(component)
-      );
-    }
-    if (component instanceof discord_js.SeparatorBuilder) {
-      container.addSeparatorComponents(component);
-    }
-  };
-  const setColor = (color) => {
-    container.setAccentColor(
-      discord_js.resolveColor(color)
-    );
-  };
-  const isContainerData = (value) => typeof value === "object" && "components" in value && Array.isArray(value.components);
+  }
+  /**
+   * Sets the accent color of the container.
+   *
+   * If a color is provided, it resolves and sets the accent color accordingly.
+   * If no color or `null` is provided, it clears the accent color.
+   *
+   * @param color - The color to set as the accent color, or `null` to clear it.
+   * @returns The current instance for chaining.
+   *
+   * @example
+   * container.setColor("#ff0000"); // Sets the accent color to red.
+   * container.setColor(null);      // Clears the accent color.
+   */
+  setColor(color) {
+    return core.isDefined(color) ? this.setAccentColor(discord_js.resolveColor(color)) : this.setAccentColor();
+  }
+  /**
+   * Replaces or removes a component at the specified index in the container.
+   *
+   * If `data` is provided, it replaces the component at the given index with the new component(s).
+   * If `null` is provided, it removes the component at that index.
+   *
+   * @param index - The index of the component to replace or remove.
+   * @param data - The new component data to set, or `null` to remove the component.
+   * @returns The current instance for chaining.
+   *
+   * @example
+   * container.setComponent(0, new ButtonBuilder({ label: "Click" }));
+   * container.setComponent(1, null); // Removes the component at index 1.
+   */
+  setComponent(index, data) {
+    const args = [index, 1];
+    if (core.isDefined(data))
+      args.push(...components.createComponents(data));
+    return this.spliceComponents(...args);
+  }
+  componentAt(index, type) {
+    return core.isDefined(type) ? this.components.filter((builder) => builder.data.type === type).at(index) : this.components.at(index);
+  }
+}
+function createContainer(data, ...items) {
+  const isContainerData = (value) => typeof value === "object" && core.isDefined(value) && !Array.isArray(value);
   if (isContainerData(data)) {
-    if (data.accentColor)
-      setColor(data.accentColor);
-    if (data.spoiler !== void 0)
-      container.setSpoiler(data.spoiler);
-    if (data.id !== void 0)
-      container.setId(data.id);
-    for (const component of data.components)
-      addComponent(component);
-    return container;
+    const { array, from } = data;
+    if (array) {
+      if (message.isMessage(from)) {
+        return from.components.filter((c) => c.type === discord_js.ComponentType.Container).map((component) => new ContainerPlusBuilder({ from: component }));
+      }
+      return [new ContainerPlusBuilder(data)];
+    }
+    return new ContainerPlusBuilder(data);
   }
-  setColor(data);
-  for (const component of items.flat())
-    addComponent(component);
-  return container;
+  return new ContainerPlusBuilder({
+    accentColor: data,
+    components: items.flat()
+  });
 }
 
+exports.ContainerPlusBuilder = ContainerPlusBuilder;
 exports.createContainer = createContainer;

package/dist/functions/components/container.mjs

@@ -1,77 +1,81 @@
-import { ContainerBuilder, TextDisplayBuilder, ActionRowBuilder, ButtonBuilder, SectionBuilder, FileBuilder, MediaGalleryBuilder, SeparatorBuilder, resolveColor } from 'discord.js';
-import { isAttachment } from '../../guards/attachment.mjs';
-import { isAnySelectMenuBuilder } from '../../guards/selectmenu.mjs';
-import { createMediaGallery } from './gallery.mjs';
-import { createRow } from './row.mjs';
-import { createTextDisplay } from './text.mjs';
+import { isDefined } from '@magicyan/core';
+import { ContainerBuilder, ComponentType, resolveColor } from 'discord.js';
+import { createComponents } from './components.mjs';
+import { isMessage } from '../../guards/message.mjs';
 
-function createContainer(data, ...items) {
-  const container = new ContainerBuilder();
-  const addComponent = (component) => {
-    if (!component)
-      return;
-    if (typeof component === "string") {
-      container.addTextDisplayComponents(
-        createTextDisplay(component)
-      );
-    }
-    if (component instanceof TextDisplayBuilder) {
-      container.addTextDisplayComponents(
-        component
-      );
-    }
-    if (component instanceof ActionRowBuilder) {
-      container.addActionRowComponents(component);
-    }
-    if (Array.isArray(component)) {
-      container.addActionRowComponents(
-        createRow(...component)
+class ContainerPlusBuilder extends ContainerBuilder {
+  constructor(data) {
+    const constructorData = isDefined(data?.from) ? isMessage(data.from) ? data.from.components.filter((v) => v.type === ComponentType.Container).at(data.fromIndex ?? 0)?.toJSON() ?? {} : data.from.toJSON() : {};
+    if (isDefined(data?.accentColor)) {
+      constructorData.accent_color = resolveColor(
+        data.accentColor
       );
     }
-    if (isAnySelectMenuBuilder(component) || component instanceof ButtonBuilder) {
-      container.addActionRowComponents(
-        createRow(component)
+    super(constructorData);
+    if (isDefined(data?.components) && data.components.length >= 1) {
+      this.spliceComponents(
+        0,
+        0,
+        ...createComponents(data.components)
       );
     }
-    if (component instanceof SectionBuilder) {
-      container.addSectionComponents(component);
-    }
-    if (component instanceof FileBuilder) {
-      container.addFileComponents(component);
-    }
-    if (component instanceof MediaGalleryBuilder) {
-      container.addMediaGalleryComponents(component);
-    }
-    if (isAttachment(component)) {
-      container.addMediaGalleryComponents(
-        createMediaGallery(component)
-      );
-    }
-    if (component instanceof SeparatorBuilder) {
-      container.addSeparatorComponents(component);
-    }
-  };
-  const setColor = (color) => {
-    container.setAccentColor(
-      resolveColor(color)
-    );
-  };
-  const isContainerData = (value) => typeof value === "object" && "components" in value && Array.isArray(value.components);
+  }
+  /**
+   * Sets the accent color of the container.
+   *
+   * If a color is provided, it resolves and sets the accent color accordingly.
+   * If no color or `null` is provided, it clears the accent color.
+   *
+   * @param color - The color to set as the accent color, or `null` to clear it.
+   * @returns The current instance for chaining.
+   *
+   * @example
+   * container.setColor("#ff0000"); // Sets the accent color to red.
+   * container.setColor(null);      // Clears the accent color.
+   */
+  setColor(color) {
+    return isDefined(color) ? this.setAccentColor(resolveColor(color)) : this.setAccentColor();
+  }
+  /**
+   * Replaces or removes a component at the specified index in the container.
+   *
+   * If `data` is provided, it replaces the component at the given index with the new component(s).
+   * If `null` is provided, it removes the component at that index.
+   *
+   * @param index - The index of the component to replace or remove.
+   * @param data - The new component data to set, or `null` to remove the component.
+   * @returns The current instance for chaining.
+   *
+   * @example
+   * container.setComponent(0, new ButtonBuilder({ label: "Click" }));
+   * container.setComponent(1, null); // Removes the component at index 1.
+   */
+  setComponent(index, data) {
+    const args = [index, 1];
+    if (isDefined(data))
+      args.push(...createComponents(data));
+    return this.spliceComponents(...args);
+  }
+  componentAt(index, type) {
+    return isDefined(type) ? this.components.filter((builder) => builder.data.type === type).at(index) : this.components.at(index);
+  }
+}
+function createContainer(data, ...items) {
+  const isContainerData = (value) => typeof value === "object" && isDefined(value) && !Array.isArray(value);
   if (isContainerData(data)) {
-    if (data.accentColor)
-      setColor(data.accentColor);
-    if (data.spoiler !== void 0)
-      container.setSpoiler(data.spoiler);
-    if (data.id !== void 0)
-      container.setId(data.id);
-    for (const component of data.components)
-      addComponent(component);
-    return container;
+    const { array, from } = data;
+    if (array) {
+      if (isMessage(from)) {
+        return from.components.filter((c) => c.type === ComponentType.Container).map((component) => new ContainerPlusBuilder({ from: component }));
+      }
+      return [new ContainerPlusBuilder(data)];
+    }
+    return new ContainerPlusBuilder(data);
   }
-  setColor(data);
-  for (const component of items.flat())
-    addComponent(component);
-  return container;
+  return new ContainerPlusBuilder({
+    accentColor: data,
+    components: items.flat()
+  });
 }
 
-export { createContainer };
+export { ContainerPlusBuilder, createContainer };

package/dist/functions/components/file.cjs

@@ -1,16 +1,14 @@
 'use strict';
 
 const discord_js = require('discord.js');
+const attachment = require('../../guards/attachment.cjs');
 
 function createFile(source, options = {}) {
   const prefix = "attachment://";
-  const url = source instanceof discord_js.AttachmentBuilder || source instanceof discord_js.Attachment ? `${prefix}${source.name}` : source;
+  const url = attachment.isAttachment(source) ? `${prefix}${source.name}` : source;
   return new discord_js.FileBuilder({
     spoiler: options.spoiler,
-    file: {
-      ...options,
-      url
-    }
+    file: { ...options, url }
   });
 }
 

package/dist/functions/components/file.mjs

@@ -1,14 +1,12 @@
-import { AttachmentBuilder, Attachment, FileBuilder } from 'discord.js';
+import { FileBuilder } from 'discord.js';
+import { isAttachment } from '../../guards/attachment.mjs';
 
 function createFile(source, options = {}) {
   const prefix = "attachment://";
-  const url = source instanceof AttachmentBuilder || source instanceof Attachment ? `${prefix}${source.name}` : source;
+  const url = isAttachment(source) ? `${prefix}${source.name}` : source;
   return new FileBuilder({
     spoiler: options.spoiler,
-    file: {
-      ...options,
-      url
-    }
+    file: { ...options, url }
   });
 }
 

package/dist/functions/components/gallery.cjs

@@ -2,20 +2,17 @@
 
 const discord_js = require('discord.js');
 const attachment = require('../../guards/attachment.cjs');
+const core = require('@magicyan/core');
 
 function createMediaGallery(...items) {
   const gallery = new discord_js.MediaGalleryBuilder();
-  for (const item of items) {
+  for (const item of items.flat().filter(core.isDefined)) {
     if (typeof item === "string") {
-      gallery.addItems({
-        media: { url: item }
-      });
+      gallery.addItems({ media: { url: item } });
       continue;
     }
     if (attachment.isAttachment(item)) {
-      gallery.addItems({
-        media: { url: `attachment://${item.name}` }
-      });
+      gallery.addItems({ media: { url: `attachment://${item.name}` } });
       continue;
     }
     gallery.addItems(item);

package/dist/functions/components/gallery.mjs

@@ -1,19 +1,16 @@
 import { MediaGalleryBuilder } from 'discord.js';
 import { isAttachment } from '../../guards/attachment.mjs';
+import { isDefined } from '@magicyan/core';
 
 function createMediaGallery(...items) {
   const gallery = new MediaGalleryBuilder();
-  for (const item of items) {
+  for (const item of items.flat().filter(isDefined)) {
     if (typeof item === "string") {
-      gallery.addItems({
-        media: { url: item }
-      });
+      gallery.addItems({ media: { url: item } });
       continue;
     }
     if (isAttachment(item)) {
-      gallery.addItems({
-        media: { url: `attachment://${item.name}` }
-      });
+      gallery.addItems({ media: { url: `attachment://${item.name}` } });
       continue;
     }
     gallery.addItems(item);

package/dist/functions/embeds/assets.cjs

@@ -1,15 +1,15 @@
 'use strict';
 
-const discord_js = require('discord.js');
+const attachment = require('../../guards/attachment.cjs');
 
 function createEmbedAsset(source, options = {}) {
-  if (source instanceof discord_js.Attachment || source instanceof discord_js.AttachmentBuilder) {
+  if (attachment.isAttachment(source)) {
     return { url: `attachment://${source.name}`, ...options };
   }
   if (source && typeof source === "object" && "url" in source) {
-    return Object.assign(source, options);
+    return { ...source, ...options };
   }
-  return source ? Object.assign({ url: source }, options) : void 0;
+  return source ? { url: source, ...options } : void 0;
 }
 
 exports.createEmbedAsset = createEmbedAsset;

package/dist/functions/embeds/assets.mjs

@@ -1,13 +1,13 @@
-import { Attachment, AttachmentBuilder } from 'discord.js';
+import { isAttachment } from '../../guards/attachment.mjs';
 
 function createEmbedAsset(source, options = {}) {
-  if (source instanceof Attachment || source instanceof AttachmentBuilder) {
+  if (isAttachment(source)) {
     return { url: `attachment://${source.name}`, ...options };
   }
   if (source && typeof source === "object" && "url" in source) {
-    return Object.assign(source, options);
+    return { ...source, ...options };
   }
-  return source ? Object.assign({ url: source }, options) : void 0;
+  return source ? { url: source, ...options } : void 0;
 }
 
 export { createEmbedAsset };

package/dist/functions/message.cjs

@@ -40,13 +40,23 @@ function findMessage(channel) {
     }
   };
 }
-function getMessageUrlInfo(url) {
-  const regex = new RegExp(/^https:\/\/discord\.com\/channels\/\d+\/\d+\/\d+$/);
-  if (!regex.test(url))
+function getMessageURLInfo(url) {
+  const match = url.match(/^https:\/\/discord\.com\/channels\/(\d+)\/(\d+)\/(\d+)$/);
+  if (!match)
     return {};
-  const [messageId, channelId, guildId] = url.split("/").reverse();
-  return { messageId, channelId, guildId };
+  const [_, guildId, channelId, messageId] = match;
+  return { guildId, channelId, messageId };
+}
+async function fetchMessageFromURL(gc, url) {
+  const { messageId, channelId } = getMessageURLInfo(url);
+  if (!messageId)
+    return null;
+  const channel = await gc.channels.fetch(channelId).catch(() => null);
+  if (!channel || !("messages" in channel))
+    return null;
+  return channel.messages.fetch(messageId).catch(() => null);
 }
 
+exports.fetchMessageFromURL = fetchMessageFromURL;
 exports.findMessage = findMessage;
-exports.getMessageUrlInfo = getMessageUrlInfo;
+exports.getMessageURLInfo = getMessageURLInfo;

package/dist/functions/message.mjs

@@ -38,12 +38,21 @@ function findMessage(channel) {
     }
   };
 }
-function getMessageUrlInfo(url) {
-  const regex = new RegExp(/^https:\/\/discord\.com\/channels\/\d+\/\d+\/\d+$/);
-  if (!regex.test(url))
+function getMessageURLInfo(url) {
+  const match = url.match(/^https:\/\/discord\.com\/channels\/(\d+)\/(\d+)\/(\d+)$/);
+  if (!match)
     return {};
-  const [messageId, channelId, guildId] = url.split("/").reverse();
-  return { messageId, channelId, guildId };
+  const [_, guildId, channelId, messageId] = match;
+  return { guildId, channelId, messageId };
+}
+async function fetchMessageFromURL(gc, url) {
+  const { messageId, channelId } = getMessageURLInfo(url);
+  if (!messageId)
+    return null;
+  const channel = await gc.channels.fetch(channelId).catch(() => null);
+  if (!channel || !("messages" in channel))
+    return null;
+  return channel.messages.fetch(messageId).catch(() => null);
 }
 
-export { findMessage, getMessageUrlInfo };
+export { fetchMessageFromURL, findMessage, getMessageURLInfo };

package/dist/functions/modals.cjs

@@ -17,7 +17,15 @@ function modalFieldsToRecord(fields) {
   const modalFields = fields instanceof discord_js.ModalSubmitInteraction ? fields.fields.fields : "fields" in fields ? fields.fields : fields;
   return modalFields.reduce(reduceFunction, {});
 }
+function createModal(data) {
+  return new discord_js.ModalBuilder({
+    title: data.title ?? data.customId,
+    customId: data.customId,
+    components: createModalFields(data.components)
+  });
+}
 
+exports.createModal = createModal;
 exports.createModalFields = createModalFields;
 exports.createModalInput = createModalInput;
 exports.modalFieldsToRecord = modalFieldsToRecord;

package/dist/functions/modals.mjs

@@ -1,4 +1,4 @@
-import { TextInputStyle, TextInputBuilder, ModalSubmitInteraction } from 'discord.js';
+import { TextInputStyle, TextInputBuilder, ModalSubmitInteraction, ModalBuilder } from 'discord.js';
 import { createRow } from './components/row.mjs';
 
 function createModalInput(data) {
@@ -15,5 +15,12 @@ function modalFieldsToRecord(fields) {
   const modalFields = fields instanceof ModalSubmitInteraction ? fields.fields.fields : "fields" in fields ? fields.fields : fields;
   return modalFields.reduce(reduceFunction, {});
 }
+function createModal(data) {
+  return new ModalBuilder({
+    title: data.title ?? data.customId,
+    customId: data.customId,
+    components: createModalFields(data.components)
+  });
+}
 
-export { createModalFields, createModalInput, modalFieldsToRecord };
+export { createModal, createModalFields, createModalInput, modalFieldsToRecord };

package/dist/guards/attachment.cjs

@@ -1,9 +1,15 @@
 'use strict';
 
 const discord_js = require('discord.js');
+const utils = require('./utils.cjs');
 
 function isAttachment(value) {
-  return value instanceof discord_js.Attachment || value instanceof discord_js.AttachmentBuilder;
+  return value instanceof discord_js.Attachment || value instanceof discord_js.AttachmentBuilder || utils.hasConstructor(value) && [
+    discord_js.Attachment.name,
+    discord_js.AttachmentBuilder.name
+  ].some(
+    (name) => name === value.constructor.name
+  );
 }
 
 exports.isAttachment = isAttachment;

package/dist/guards/attachment.mjs

@@ -1,7 +1,13 @@
 import { Attachment, AttachmentBuilder } from 'discord.js';
+import { hasConstructor } from './utils.mjs';
 
 function isAttachment(value) {
-  return value instanceof Attachment || value instanceof AttachmentBuilder;
+  return value instanceof Attachment || value instanceof AttachmentBuilder || hasConstructor(value) && [
+    Attachment.name,
+    AttachmentBuilder.name
+  ].some(
+    (name) => name === value.constructor.name
+  );
 }
 
 export { isAttachment };