@magicyan/discord 1.0.28 → 1.0.30

package/README.md

@@ -114,8 +114,37 @@ function run(interaction: ModalSubmitInteraction){
     console.log(fields.bio);
 }
 ```
+
 ## Embeds
-> soon
+Easily create embeds with this function
+```ts
+const embed = createEmbed({
+    title: "Welcome",
+    description: "Hello world",
+    color: "Random"
+});
+```
+You can set the thumbnail and image in a simple way
+```ts
+const embed = createEmbed({
+    // ...
+    thumbnail: "https://github.com/rinckodev.png",
+    image: guild.iconURL()
+});
+
+// Or passing an options object
+const embed = createEmbed({
+    // ...
+    image: { url: "imageurl", width: 400, height: 100 }
+});
+
+//Or passing an attachment
+const attachment = new AttachmentBuilder(buffer, { name: "myimage.png" });
+const embed = createEmbed({
+    // ...
+    image: attachment // attachment://myimage.png
+});
+```
 
 ## Channels
 You can try to get information from a channel url

package/dist/functions/channels.cjs

@@ -6,53 +6,53 @@ function findChannel(guild, type) {
   const channelType = type ?? discord_js.ChannelType.GuildText;
   const cache = guild.channels.cache;
   return {
-    byName(name, filter = () => true) {
+    byId(id) {
       return cache.find(
-        (c) => c.name === name && c.type === channelType && filter
+        (c) => c.id === id && c.type === channelType
       );
     },
-    byId(id) {
+    byName(name, and = () => true) {
       return cache.find(
-        (c) => c.id === id && c.type === channelType
+        (c) => c.name === name && c.type === channelType && and(c)
       );
     },
     byFilter(filter) {
-      return cache.find((c) => c.type == type && filter);
+      return cache.find((c) => c.type == type && filter(c));
     },
     inCategoryId(id) {
       return {
-        byName(name, filter = () => true) {
+        byId(id2) {
           return cache.find(
-            (c) => c.name === name && c.type === channelType && c.parentId == id && filter
+            (c) => c.id === id2 && c.type === channelType && c.parentId == id2
           );
         },
-        byId(id2, filter = () => true) {
+        byName(name, and = () => true) {
           return cache.find(
-            (c) => c.id === id2 && c.type === channelType && c.parentId == id2 && filter
+            (c) => c.name === name && c.type === channelType && c.parentId == id && and(c)
           );
         },
         byFilter(filter) {
           return cache.find(
-            (c) => c.type === channelType && c.parent?.id == id && filter
+            (c) => c.type === channelType && c.parent?.id == id && filter(c)
           );
         }
       };
     },
     inCategoryName(name) {
       return {
-        byName(name2, filter = () => true) {
+        byId(id) {
           return cache.find(
-            (c) => c.name === name2 && c.type === channelType && c.parent?.name == name2 && filter
+            (c) => c.id === id && c.type === channelType && c.parent?.name == name
           );
         },
-        byId(id, filter = () => true) {
+        byName(name2, and = () => true) {
           return cache.find(
-            (c) => c.id === id && c.type === channelType && c.parent?.name == name && filter
+            (c) => c.name === name2 && c.type === channelType && c.parent?.name == name2 && and(c)
           );
         },
         byFilter(filter) {
           return cache.find(
-            (c) => c.type === channelType && c.parent?.name == name && filter
+            (c) => c.type === channelType && c.parent?.name == name && filter(c)
           );
         }
       };

package/dist/functions/channels.mjs

@@ -4,53 +4,53 @@ function findChannel(guild, type) {
   const channelType = type ?? ChannelType.GuildText;
   const cache = guild.channels.cache;
   return {
-    byName(name, filter = () => true) {
+    byId(id) {
       return cache.find(
-        (c) => c.name === name && c.type === channelType && filter
+        (c) => c.id === id && c.type === channelType
       );
     },
-    byId(id) {
+    byName(name, and = () => true) {
       return cache.find(
-        (c) => c.id === id && c.type === channelType
+        (c) => c.name === name && c.type === channelType && and(c)
       );
     },
     byFilter(filter) {
-      return cache.find((c) => c.type == type && filter);
+      return cache.find((c) => c.type == type && filter(c));
     },
     inCategoryId(id) {
       return {
-        byName(name, filter = () => true) {
+        byId(id2) {
           return cache.find(
-            (c) => c.name === name && c.type === channelType && c.parentId == id && filter
+            (c) => c.id === id2 && c.type === channelType && c.parentId == id2
           );
         },
-        byId(id2, filter = () => true) {
+        byName(name, and = () => true) {
           return cache.find(
-            (c) => c.id === id2 && c.type === channelType && c.parentId == id2 && filter
+            (c) => c.name === name && c.type === channelType && c.parentId == id && and(c)
           );
         },
         byFilter(filter) {
           return cache.find(
-            (c) => c.type === channelType && c.parent?.id == id && filter
+            (c) => c.type === channelType && c.parent?.id == id && filter(c)
           );
         }
       };
     },
     inCategoryName(name) {
       return {
-        byName(name2, filter = () => true) {
+        byId(id) {
           return cache.find(
-            (c) => c.name === name2 && c.type === channelType && c.parent?.name == name2 && filter
+            (c) => c.id === id && c.type === channelType && c.parent?.name == name
           );
         },
-        byId(id, filter = () => true) {
+        byName(name2, and = () => true) {
           return cache.find(
-            (c) => c.id === id && c.type === channelType && c.parent?.name == name && filter
+            (c) => c.name === name2 && c.type === channelType && c.parent?.name == name2 && and(c)
           );
         },
         byFilter(filter) {
           return cache.find(
-            (c) => c.type === channelType && c.parent?.name == name && filter
+            (c) => c.type === channelType && c.parent?.name == name && filter(c)
           );
         }
       };

package/dist/functions/embeds/assets.cjs

@@ -7,9 +7,9 @@ function createEmbedAsset(source, options) {
     return { url: `attachment://${source.name}`, ...options };
   }
   if (source && typeof source === "object" && "url" in source) {
-    return source;
+    return Object.assign(source, options ?? (options = {}));
   }
-  return source ? { url: source, ...options } : void 0;
+  return source ? Object.assign({ url: source }, options) : void 0;
 }
 
 exports.createEmbedAsset = createEmbedAsset;

package/dist/functions/embeds/assets.mjs

@@ -5,9 +5,9 @@ function createEmbedAsset(source, options) {
     return { url: `attachment://${source.name}`, ...options };
   }
   if (source && typeof source === "object" && "url" in source) {
-    return source;
+    return Object.assign(source, options ?? (options = {}));
   }
-  return source ? { url: source, ...options } : void 0;
+  return source ? Object.assign({ url: source }, options) : void 0;
 }
 
 export { createEmbedAsset };

package/dist/functions/embeds/author.cjs

@@ -1,30 +1,33 @@
 'use strict';
 
-function createEmbedAuthor(options) {
-  const { prefix = "", suffix = "", url, iconURL } = options;
-  const { size = 512, extension, forceStatic } = options;
-  const avatarOptions = { size, extension, forceStatic };
-  if ("member" in options) {
-    const { member, property: property2 = "displayName" } = options;
-    const name = {
-      id: member.id,
-      username: member.user.username,
-      displayName: member.displayName,
-      globalName: member.user.globalName,
-      nickname: member.nickname
-    }[property2] ?? member.displayName;
-    return {
-      name: `${prefix}${name}${suffix}`,
-      url,
-      iconURL: iconURL || member.displayAvatarURL(avatarOptions)
-    };
+const discord_js = require('discord.js');
+
+function createEmbedAuthor(type, options) {
+  const { prefix = "", suffix = "", url, iconURL: icon, extension, forceStatic, size = 1024 } = options ?? {};
+  let name = "";
+  let iconURL = icon;
+  const imageOptions = { extension, forceStatic, size };
+  switch (true) {
+    case type instanceof discord_js.User: {
+      const { property = "displayName" } = options ?? {};
+      name = type[property] ?? type.displayName;
+      iconURL = type.displayAvatarURL(imageOptions);
+      break;
+    }
+    case type instanceof discord_js.GuildMember: {
+      const { property = "displayName" } = options ?? {};
+      name = (property == "username" || property == "globalName" ? type.user[property] : type[property]) ?? type.displayName;
+      iconURL = type.displayAvatarURL(imageOptions);
+      break;
+    }
+    case type instanceof discord_js.Guild: {
+      const { property = "name" } = options ?? {};
+      name = type[property];
+      iconURL = type.iconURL(imageOptions) ?? void 0;
+      break;
+    }
   }
-  const { property = "displayName", user } = options;
-  return {
-    name: `${prefix}${options.user[property]}${suffix}`,
-    url,
-    iconURL: iconURL || user.displayAvatarURL(avatarOptions)
-  };
+  return { name: `${prefix}${name}${suffix}`, url: url ?? void 0, iconURL };
 }
 
 exports.createEmbedAuthor = createEmbedAuthor;

package/dist/functions/embeds/author.mjs

@@ -1,28 +1,31 @@
-function createEmbedAuthor(options) {
-  const { prefix = "", suffix = "", url, iconURL } = options;
-  const { size = 512, extension, forceStatic } = options;
-  const avatarOptions = { size, extension, forceStatic };
-  if ("member" in options) {
-    const { member, property: property2 = "displayName" } = options;
-    const name = {
-      id: member.id,
-      username: member.user.username,
-      displayName: member.displayName,
-      globalName: member.user.globalName,
-      nickname: member.nickname
-    }[property2] ?? member.displayName;
-    return {
-      name: `${prefix}${name}${suffix}`,
-      url,
-      iconURL: iconURL || member.displayAvatarURL(avatarOptions)
-    };
+import { Guild, GuildMember, User } from 'discord.js';
+
+function createEmbedAuthor(type, options) {
+  const { prefix = "", suffix = "", url, iconURL: icon, extension, forceStatic, size = 1024 } = options ?? {};
+  let name = "";
+  let iconURL = icon;
+  const imageOptions = { extension, forceStatic, size };
+  switch (true) {
+    case type instanceof User: {
+      const { property = "displayName" } = options ?? {};
+      name = type[property] ?? type.displayName;
+      iconURL = type.displayAvatarURL(imageOptions);
+      break;
+    }
+    case type instanceof GuildMember: {
+      const { property = "displayName" } = options ?? {};
+      name = (property == "username" || property == "globalName" ? type.user[property] : type[property]) ?? type.displayName;
+      iconURL = type.displayAvatarURL(imageOptions);
+      break;
+    }
+    case type instanceof Guild: {
+      const { property = "name" } = options ?? {};
+      name = type[property];
+      iconURL = type.iconURL(imageOptions) ?? void 0;
+      break;
+    }
   }
-  const { property = "displayName", user } = options;
-  return {
-    name: `${prefix}${options.user[property]}${suffix}`,
-    url,
-    iconURL: iconURL || user.displayAvatarURL(avatarOptions)
-  };
+  return { name: `${prefix}${name}${suffix}`, url: url ?? void 0, iconURL };
 }
 
 export { createEmbedAuthor };

package/dist/functions/embeds/embedplus.cjs

@@ -15,7 +15,7 @@ var __publicField = (obj, key, value) => {
 class EmbedPlusBuilder extends discord_js.EmbedBuilder {
   constructor(data) {
     const { mergeFields = false, extends: extendsEmbed, ...embedData } = data;
-    const extendsEmbedData = extendsEmbed ? "data" in extendsEmbed ? extendsEmbed.data : data : {};
+    const extendsEmbedData = extendsEmbed ? "data" in extendsEmbed ? extendsEmbed.data : extendsEmbed : {};
     const { fields: extendsFields, ...extendsData } = extendsEmbedData;
     const fields$1 = (mergeFields ? [extendsFields ?? [], data.fields ?? []].flat() : data.fields ?? extendsFields ?? []).map((field) => Object.assign(
       { name: field.name ?? chars.chars.invisible, value: field.value ?? chars.chars.invisible },
@@ -57,16 +57,19 @@ class EmbedPlusBuilder extends discord_js.EmbedBuilder {
   setBorderColor(color) {
     if (color === null) {
       this.setColor("#2B2D31");
+    } else if (typeof color === "number") {
+      this.update({ color });
     } else {
       this.setColor(color);
     }
     return this;
   }
   setAsset(asset, source) {
-    const assetData = assets.createEmbedAsset(source);
-    if (!assetData?.url)
-      return this;
-    asset === "image" ? this.setImage(assetData.url) : this.setThumbnail(assetData.url);
+    if (source === null) {
+      asset === "image" ? this.setImage(source) : this.setThumbnail(source);
+    } else {
+      this.update({ [asset]: source });
+    }
     return this;
   }
   static fromInteraction(interaction, index = 0, data = {}) {

package/dist/functions/embeds/embedplus.mjs

@@ -13,7 +13,7 @@ var __publicField = (obj, key, value) => {
 class EmbedPlusBuilder extends EmbedBuilder {
   constructor(data) {
     const { mergeFields = false, extends: extendsEmbed, ...embedData } = data;
-    const extendsEmbedData = extendsEmbed ? "data" in extendsEmbed ? extendsEmbed.data : data : {};
+    const extendsEmbedData = extendsEmbed ? "data" in extendsEmbed ? extendsEmbed.data : extendsEmbed : {};
     const { fields: extendsFields, ...extendsData } = extendsEmbedData;
     const fields = (mergeFields ? [extendsFields ?? [], data.fields ?? []].flat() : data.fields ?? extendsFields ?? []).map((field) => Object.assign(
       { name: field.name ?? chars.invisible, value: field.value ?? chars.invisible },
@@ -55,16 +55,19 @@ class EmbedPlusBuilder extends EmbedBuilder {
   setBorderColor(color) {
     if (color === null) {
       this.setColor("#2B2D31");
+    } else if (typeof color === "number") {
+      this.update({ color });
     } else {
       this.setColor(color);
     }
     return this;
   }
   setAsset(asset, source) {
-    const assetData = createEmbedAsset(source);
-    if (!assetData?.url)
-      return this;
-    asset === "image" ? this.setImage(assetData.url) : this.setThumbnail(assetData.url);
+    if (source === null) {
+      asset === "image" ? this.setImage(source) : this.setThumbnail(source);
+    } else {
+      this.update({ [asset]: source });
+    }
     return this;
   }
   static fromInteraction(interaction, index = 0, data = {}) {

package/dist/functions/embeds/fields.cjs

@@ -57,6 +57,9 @@ class EmbedPlusFields {
   set(...fields) {
     this.embed.setFields(fields);
   }
+  map(callback) {
+    return this.toArray().map(callback);
+  }
   update(predicate, field) {
     const index = this.getPredicateIndex(predicate);
     if (index == -1)
@@ -77,6 +80,13 @@ class EmbedPlusFields {
     this.embed.spliceFields(index, 1);
     return true;
   }
+  /**
+   * Remove all fields
+   */
+  clear() {
+    this.fields = [];
+    return this;
+  }
   toArray() {
     return Array.from(this);
   }

package/dist/functions/embeds/fields.mjs

@@ -55,6 +55,9 @@ class EmbedPlusFields {
   set(...fields) {
     this.embed.setFields(fields);
   }
+  map(callback) {
+    return this.toArray().map(callback);
+  }
   update(predicate, field) {
     const index = this.getPredicateIndex(predicate);
     if (index == -1)
@@ -75,6 +78,13 @@ class EmbedPlusFields {
     this.embed.spliceFields(index, 1);
     return true;
   }
+  /**
+   * Remove all fields
+   */
+  clear() {
+    this.fields = [];
+    return this;
+  }
   toArray() {
     return Array.from(this);
   }

package/dist/index.cjs

@@ -3,19 +3,19 @@
 const chars = require('./constants/chars.cjs');
 const client = require('./constants/client.cjs');
 const misc = require('./functions/misc.cjs');
+const assets = require('./functions/embeds/assets.cjs');
+const author = require('./functions/embeds/author.cjs');
+const embedplus = require('./functions/embeds/embedplus.cjs');
+const footer = require('./functions/embeds/footer.cjs');
+const components = require('./functions/components.cjs');
 const channels = require('./functions/channels.cjs');
 const commands = require('./functions/commands.cjs');
-const components = require('./functions/components.cjs');
 const modals = require('./functions/modals.cjs');
 const emojis = require('./functions/emojis.cjs');
 const members = require('./functions/members.cjs');
 const message = require('./functions/message.cjs');
 const roles = require('./functions/roles.cjs');
 const regex = require('./functions/regex.cjs');
-const assets = require('./functions/embeds/assets.cjs');
-const author = require('./functions/embeds/author.cjs');
-const embedplus = require('./functions/embeds/embedplus.cjs');
-const footer = require('./functions/embeds/footer.cjs');
 const core = require('@magicyan/core');
 
 
@@ -24,11 +24,16 @@ exports.chars = chars.chars;
 exports.CustomItents = client.CustomItents;
 exports.CustomPartials = client.CustomPartials;
 exports.setMobileStatus = misc.setMobileStatus;
+exports.createEmbedAsset = assets.createEmbedAsset;
+exports.createEmbedAuthor = author.createEmbedAuthor;
+exports.EmbedPlusBuilder = embedplus.EmbedPlusBuilder;
+exports.createEmbed = embedplus.createEmbed;
+exports.createEmbedFooter = footer.createEmbedFooter;
+exports.createLinkButton = components.createLinkButton;
+exports.createRow = components.createRow;
 exports.findChannel = channels.findChannel;
 exports.getChannelUrlInfo = channels.getChannelUrlInfo;
 exports.findCommand = commands.findCommand;
-exports.createLinkButton = components.createLinkButton;
-exports.createRow = components.createRow;
 exports.createModalFields = modals.createModalFields;
 exports.createModalInput = modals.createModalInput;
 exports.modalFieldsToRecord = modals.modalFieldsToRecord;
@@ -38,11 +43,6 @@ exports.findMessage = message.findMessage;
 exports.getMessageUrlInfo = message.getMessageUrlInfo;
 exports.findRole = roles.findRole;
 exports.extractMentionId = regex.extractMentionId;
-exports.createEmbedAsset = assets.createEmbedAsset;
-exports.createEmbedAuthor = author.createEmbedAuthor;
-exports.EmbedPlusBuilder = embedplus.EmbedPlusBuilder;
-exports.createEmbed = embedplus.createEmbed;
-exports.createEmbedFooter = footer.createEmbedFooter;
 Object.keys(core).forEach(function (k) {
 	if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = core[k];
 });