@magicyan/discord 1.3.1 → 1.4.1

package/dist/functions/{components.cjs → components/buttons.cjs}

@@ -2,13 +2,9 @@
 
 const discord_js = require('discord.js');
 
-function createRow(...components) {
-  return new discord_js.ActionRowBuilder({ components });
-}
 function createLinkButton(data) {
   data.label ?? (data.label = data.url);
   return new discord_js.ButtonBuilder({ style: discord_js.ButtonStyle.Link, ...data });
 }
 
 exports.createLinkButton = createLinkButton;
-exports.createRow = createRow;

package/dist/functions/components/buttons.mjs

@@ -0,0 +1,8 @@
+import { ButtonBuilder, ButtonStyle } from 'discord.js';
+
+function createLinkButton(data) {
+  data.label ?? (data.label = data.url);
+  return new ButtonBuilder({ style: ButtonStyle.Link, ...data });
+}
+
+export { createLinkButton };

package/dist/functions/components/components.cjs

@@ -0,0 +1,28 @@
+'use strict';
+
+const discord_js = require('discord.js');
+const selectmenu = require('../../guards/selectmenu.cjs');
+const attachment = require('../../guards/attachment.cjs');
+const gallery = require('./gallery.cjs');
+const text = require('./text.cjs');
+const row = require('./row.cjs');
+
+function createComponents(...data) {
+  return data.filter((value) => value !== null).map((component) => {
+    if (typeof component === "string") {
+      return text.createTextDisplay(component);
+    }
+    if (Array.isArray(component)) {
+      return row.createRow(...component);
+    }
+    if (selectmenu.isAnySelectMenuBuilder(component) || component instanceof discord_js.ButtonBuilder) {
+      return row.createRow(component);
+    }
+    if (attachment.isAttachment(component)) {
+      return gallery.createMediaGallery(component);
+    }
+    return component;
+  });
+}
+
+exports.createComponents = createComponents;

package/dist/functions/components/components.mjs

@@ -0,0 +1,26 @@
+import { ButtonBuilder } from 'discord.js';
+import { isAnySelectMenuBuilder } from '../../guards/selectmenu.mjs';
+import { isAttachment } from '../../guards/attachment.mjs';
+import { createMediaGallery } from './gallery.mjs';
+import { createTextDisplay } from './text.mjs';
+import { createRow } from './row.mjs';
+
+function createComponents(...data) {
+  return data.filter((value) => value !== null).map((component) => {
+    if (typeof component === "string") {
+      return createTextDisplay(component);
+    }
+    if (Array.isArray(component)) {
+      return createRow(...component);
+    }
+    if (isAnySelectMenuBuilder(component) || component instanceof ButtonBuilder) {
+      return createRow(component);
+    }
+    if (isAttachment(component)) {
+      return createMediaGallery(component);
+    }
+    return component;
+  });
+}
+
+export { createComponents };

package/dist/functions/components/container.cjs

@@ -0,0 +1,63 @@
+'use strict';
+
+const core = require('@magicyan/core');
+const discord_js = require('discord.js');
+const selectmenu = require('../../guards/selectmenu.cjs');
+const attachment = require('../../guards/attachment.cjs');
+const gallery = require('./gallery.cjs');
+const text = require('./text.cjs');
+const row = require('./row.cjs');
+
+function createContainer(data) {
+  const container = new discord_js.ContainerBuilder();
+  data.accentColor && container.setAccentColor(
+    typeof data.accentColor === "string" ? data.accentColor in discord_js.Colors ? discord_js.Colors[data.accentColor] : core.hexToRgb(data.accentColor) : data.accentColor
+  );
+  for (const component of data.components) {
+    if (!component)
+      continue;
+    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)
+      );
+    }
+    if (selectmenu.isAnySelectMenuBuilder(component) || component instanceof discord_js.ButtonBuilder) {
+      container.addActionRowComponents(
+        row.createRow(component)
+      );
+    }
+    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);
+    }
+  }
+  return container;
+}
+
+exports.createContainer = createContainer;

package/dist/functions/components/container.mjs

@@ -0,0 +1,61 @@
+import { hexToRgb } from '@magicyan/core';
+import { ContainerBuilder, Colors, TextDisplayBuilder, ActionRowBuilder, ButtonBuilder, SectionBuilder, FileBuilder, MediaGalleryBuilder, SeparatorBuilder } from 'discord.js';
+import { isAnySelectMenuBuilder } from '../../guards/selectmenu.mjs';
+import { isAttachment } from '../../guards/attachment.mjs';
+import { createMediaGallery } from './gallery.mjs';
+import { createTextDisplay } from './text.mjs';
+import { createRow } from './row.mjs';
+
+function createContainer(data) {
+  const container = new ContainerBuilder();
+  data.accentColor && container.setAccentColor(
+    typeof data.accentColor === "string" ? data.accentColor in Colors ? Colors[data.accentColor] : hexToRgb(data.accentColor) : data.accentColor
+  );
+  for (const component of data.components) {
+    if (!component)
+      continue;
+    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)
+      );
+    }
+    if (isAnySelectMenuBuilder(component) || component instanceof ButtonBuilder) {
+      container.addActionRowComponents(
+        createRow(component)
+      );
+    }
+    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);
+    }
+  }
+  return container;
+}
+
+export { createContainer };

package/dist/functions/components/file.cjs

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

package/dist/functions/components/file.mjs

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

package/dist/functions/components/gallery.cjs

@@ -0,0 +1,26 @@
+'use strict';
+
+const discord_js = require('discord.js');
+const attachment = require('../../guards/attachment.cjs');
+
+function createMediaGallery(...items) {
+  const gallery = new discord_js.MediaGalleryBuilder();
+  for (const item of items) {
+    if (typeof item === "string") {
+      gallery.addItems({
+        media: { url: item }
+      });
+      continue;
+    }
+    if (attachment.isAttachment(item)) {
+      gallery.addItems({
+        media: { url: `attachment://${item.name}` }
+      });
+      continue;
+    }
+    gallery.addItems(item);
+  }
+  return gallery;
+}
+
+exports.createMediaGallery = createMediaGallery;

package/dist/functions/components/gallery.mjs

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

package/dist/functions/components/row.cjs

@@ -0,0 +1,9 @@
+'use strict';
+
+const discord_js = require('discord.js');
+
+function createRow(...components) {
+  return new discord_js.ActionRowBuilder({ components });
+}
+
+exports.createRow = createRow;

package/dist/functions/components/row.mjs

@@ -0,0 +1,7 @@
+import { ActionRowBuilder } from 'discord.js';
+
+function createRow(...components) {
+  return new ActionRowBuilder({ components });
+}
+
+export { createRow };

package/dist/functions/components/section.cjs

@@ -0,0 +1,29 @@
+'use strict';
+
+const discord_js = require('discord.js');
+const text = require('./text.cjs');
+const thumbnail = require('./thumbnail.cjs');
+
+function createSection(data) {
+  const section = new discord_js.SectionBuilder();
+  if (data.button) {
+    section.setButtonAccessory(data.button);
+  }
+  if (data.thumbnail) {
+    section.setThumbnailAccessory(
+      thumbnail.createThumbnail(data.thumbnail)
+    );
+  }
+  if (Array.isArray(data.content)) {
+    section.addTextDisplayComponents(
+      data.content.map(text.createTextDisplay)
+    );
+  } else {
+    section.addTextDisplayComponents(
+      text.createTextDisplay(data.content)
+    );
+  }
+  return section;
+}
+
+exports.createSection = createSection;

package/dist/functions/components/section.mjs

@@ -0,0 +1,27 @@
+import { SectionBuilder } from 'discord.js';
+import { createTextDisplay } from './text.mjs';
+import { createThumbnail } from './thumbnail.mjs';
+
+function createSection(data) {
+  const section = new SectionBuilder();
+  if (data.button) {
+    section.setButtonAccessory(data.button);
+  }
+  if (data.thumbnail) {
+    section.setThumbnailAccessory(
+      createThumbnail(data.thumbnail)
+    );
+  }
+  if (Array.isArray(data.content)) {
+    section.addTextDisplayComponents(
+      data.content.map(createTextDisplay)
+    );
+  } else {
+    section.addTextDisplayComponents(
+      createTextDisplay(data.content)
+    );
+  }
+  return section;
+}
+
+export { createSection };

package/dist/functions/components/separator.cjs

@@ -0,0 +1,12 @@
+'use strict';
+
+const discord_js = require('discord.js');
+
+function createSeparator(data = {}) {
+  return new discord_js.SeparatorBuilder({
+    divider: data.divider,
+    spacing: data.large ? discord_js.SeparatorSpacingSize.Large : discord_js.SeparatorSpacingSize.Small
+  });
+}
+
+exports.createSeparator = createSeparator;

package/dist/functions/components/separator.mjs

@@ -0,0 +1,10 @@
+import { SeparatorBuilder, SeparatorSpacingSize } from 'discord.js';
+
+function createSeparator(data = {}) {
+  return new SeparatorBuilder({
+    divider: data.divider,
+    spacing: data.large ? SeparatorSpacingSize.Large : SeparatorSpacingSize.Small
+  });
+}
+
+export { createSeparator };

package/dist/functions/components/text.cjs

@@ -0,0 +1,12 @@
+'use strict';
+
+const discord_js = require('discord.js');
+
+function createTextDisplay(content, id) {
+  return new discord_js.TextDisplayBuilder({
+    content,
+    id
+  });
+}
+
+exports.createTextDisplay = createTextDisplay;

package/dist/functions/components/text.mjs

@@ -0,0 +1,10 @@
+import { TextDisplayBuilder } from 'discord.js';
+
+function createTextDisplay(content, id) {
+  return new TextDisplayBuilder({
+    content,
+    id
+  });
+}
+
+export { createTextDisplay };

package/dist/functions/components/thumbnail.cjs

@@ -0,0 +1,16 @@
+'use strict';
+
+const discord_js = require('discord.js');
+
+function createThumbnail(data) {
+  const thumbnail = new discord_js.ThumbnailBuilder();
+  if (typeof data === "string") {
+    return thumbnail.setURL(data);
+  }
+  if (data instanceof discord_js.AttachmentBuilder || data instanceof discord_js.Attachment) {
+    return thumbnail.setURL(`attachment://${data.name}`).setSpoiler(data.spoiler);
+  }
+  return new discord_js.ThumbnailBuilder(data);
+}
+
+exports.createThumbnail = createThumbnail;

package/dist/functions/components/thumbnail.mjs

@@ -0,0 +1,14 @@
+import { ThumbnailBuilder, AttachmentBuilder, Attachment } from 'discord.js';
+
+function createThumbnail(data) {
+  const thumbnail = new ThumbnailBuilder();
+  if (typeof data === "string") {
+    return thumbnail.setURL(data);
+  }
+  if (data instanceof AttachmentBuilder || data instanceof Attachment) {
+    return thumbnail.setURL(`attachment://${data.name}`).setSpoiler(data.spoiler);
+  }
+  return new ThumbnailBuilder(data);
+}
+
+export { createThumbnail };

package/dist/functions/embeds/embedplus.cjs

@@ -1,11 +1,12 @@
 'use strict';
 
+const core = require('@magicyan/core');
 const discord_js = require('discord.js');
+const chars = require('../../constants/chars.cjs');
+const colors = require('../../constants/colors.cjs');
 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;
@@ -25,17 +26,22 @@ class EmbedPlusBuilder extends discord_js.EmbedBuilder {
     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)
+    const { color, footer: footer$1, image, thumbnail, timestamp, description } = embedData;
+    if (!footer$1)
+      delete builderData.footer;
+    if (footer$1) {
       Object.assign(builderData, { footer: footer.createEmbedFooter(footer$1) });
+    }
     if (image)
       Object.assign(builderData, { image: assets.createEmbedAsset(image) });
     if (thumbnail)
       Object.assign(builderData, { thumbnail: assets.createEmbedAsset(thumbnail) });
+    if (description)
+      builderData.description = core.brBuilder(description);
     const embed = new discord_js.EmbedBuilder(builderData);
     if (timestamp)
       embed.setTimestamp(
-        typeof timestamp === "string" ? new Date(timestamp) : timestamp
+        typeof timestamp === "string" ? new Date(timestamp) : typeof timestamp === "boolean" ? /* @__PURE__ */ new Date() : timestamp
       );
     if (color)
       embed.setColor(color);
@@ -71,16 +77,6 @@ class EmbedPlusBuilder extends discord_js.EmbedBuilder {
     }
     return this;
   }
-  // public setBorderColor(color: EmbedPlusColorData | null): this {
-  //     if (color === null){
-  //         this.setColor(colors.embedbg as ColorResolvable);
-  //     } else if (typeof color === "number"){
-  //         this.update({ color });
-  //     } else {
-  //         this.setColor(color as ColorResolvable);
-  //     }
-  //     return this;
-  // }
   setAsset(asset, source) {
     this.update({ [asset]: source });
     return this;

package/dist/functions/embeds/embedplus.mjs

@@ -1,9 +1,10 @@
+import { brBuilder } from '@magicyan/core';
 import { EmbedBuilder, AttachmentBuilder } from 'discord.js';
+import { chars } from '../../constants/chars.mjs';
+import { colors } from '../../constants/colors.mjs';
 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;
@@ -23,17 +24,22 @@ class EmbedPlusBuilder extends EmbedBuilder {
     const builderData = Object.assign({}, extendsData, embedData, { fields });
     if (builderData.url)
       builderData.url = builderData.url.toString();
-    const { color, footer, image, thumbnail, timestamp } = embedData;
-    if (footer)
+    const { color, footer, image, thumbnail, timestamp, description } = embedData;
+    if (!footer)
+      delete builderData.footer;
+    if (footer) {
       Object.assign(builderData, { footer: createEmbedFooter(footer) });
+    }
     if (image)
       Object.assign(builderData, { image: createEmbedAsset(image) });
     if (thumbnail)
       Object.assign(builderData, { thumbnail: createEmbedAsset(thumbnail) });
+    if (description)
+      builderData.description = brBuilder(description);
     const embed = new EmbedBuilder(builderData);
     if (timestamp)
       embed.setTimestamp(
-        typeof timestamp === "string" ? new Date(timestamp) : timestamp
+        typeof timestamp === "string" ? new Date(timestamp) : typeof timestamp === "boolean" ? /* @__PURE__ */ new Date() : timestamp
       );
     if (color)
       embed.setColor(color);
@@ -69,16 +75,6 @@ class EmbedPlusBuilder extends EmbedBuilder {
     }
     return this;
   }
-  // public setBorderColor(color: EmbedPlusColorData | null): this {
-  //     if (color === null){
-  //         this.setColor(colors.embedbg as ColorResolvable);
-  //     } else if (typeof color === "number"){
-  //         this.update({ color });
-  //     } else {
-  //         this.setColor(color as ColorResolvable);
-  //     }
-  //     return this;
-  // }
   setAsset(asset, source) {
     this.update({ [asset]: source });
     return this;

package/dist/functions/embeds/footer.cjs

@@ -3,6 +3,9 @@
 const chars = require('../../constants/chars.cjs');
 
 function createEmbedFooter(options) {
+  if (typeof options === "string") {
+    return { text: options };
+  }
   const { text, iconURL } = options;
   return !text && !iconURL ? void 0 : { text: text || chars.chars.invisible, iconURL: iconURL || void 0 };
 }

package/dist/functions/embeds/footer.mjs

@@ -1,6 +1,9 @@
 import { chars } from '../../constants/chars.mjs';
 
 function createEmbedFooter(options) {
+  if (typeof options === "string") {
+    return { text: options };
+  }
   const { text, iconURL } = options;
   return !text && !iconURL ? void 0 : { text: text || chars.invisible, iconURL: iconURL || void 0 };
 }

package/dist/functions/modals.cjs

@@ -1,22 +1,19 @@
 'use strict';
 
 const discord_js = require('discord.js');
-const components = require('./components.cjs');
+const row = require('./components/row.cjs');
 
 function createModalInput(data) {
   data.style ?? (data.style = discord_js.TextInputStyle.Short);
-  return components.createRow(new discord_js.TextInputBuilder(data));
+  return row.createRow(new discord_js.TextInputBuilder(data));
 }
 function createModalFields(data) {
   return Object.entries(data).map(
-    ([customId, data2]) => createModalInput(Object.assign({ customId }, data2))
+    ([customId, data2]) => createModalInput({ customId, ...data2 })
   );
 }
 function modalFieldsToRecord(fields) {
-  const reduceFunction = (data, { customId, value }) => Object.assign(
-    data,
-    { [customId]: value }
-  );
+  const reduceFunction = (data, { customId, value }) => ({ ...data, [customId]: value });
   const modalFields = fields instanceof discord_js.ModalSubmitInteraction ? fields.fields.fields : "fields" in fields ? fields.fields : fields;
   return modalFields.reduce(reduceFunction, {});
 }

package/dist/functions/modals.mjs

@@ -1,5 +1,5 @@
 import { TextInputStyle, TextInputBuilder, ModalSubmitInteraction } from 'discord.js';
-import { createRow } from './components.mjs';
+import { createRow } from './components/row.mjs';
 
 function createModalInput(data) {
   data.style ?? (data.style = TextInputStyle.Short);
@@ -7,14 +7,11 @@ function createModalInput(data) {
 }
 function createModalFields(data) {
   return Object.entries(data).map(
-    ([customId, data2]) => createModalInput(Object.assign({ customId }, data2))
+    ([customId, data2]) => createModalInput({ customId, ...data2 })
   );
 }
 function modalFieldsToRecord(fields) {
-  const reduceFunction = (data, { customId, value }) => Object.assign(
-    data,
-    { [customId]: value }
-  );
+  const reduceFunction = (data, { customId, value }) => ({ ...data, [customId]: value });
   const modalFields = fields instanceof ModalSubmitInteraction ? fields.fields.fields : "fields" in fields ? fields.fields : fields;
   return modalFields.reduce(reduceFunction, {});
 }

package/dist/guards/attachment.cjs

@@ -0,0 +1,9 @@
+'use strict';
+
+const discord_js = require('discord.js');
+
+function isAttachment(value) {
+  return value instanceof discord_js.Attachment || value instanceof discord_js.AttachmentBuilder;
+}
+
+exports.isAttachment = isAttachment;

package/dist/guards/attachment.mjs

@@ -0,0 +1,7 @@
+import { Attachment, AttachmentBuilder } from 'discord.js';
+
+function isAttachment(value) {
+  return value instanceof Attachment || value instanceof AttachmentBuilder;
+}
+
+export { isAttachment };