@spatulox/simplediscordbot 1.0.34 → 1.0.35

package/dist/index.mjs

@@ -289,7 +289,7 @@ InternetChecker.TARGET = "https://1.1.1.1";
 InternetChecker.RETRY_TIME = Time.second.SEC_30;
 
 // src/bot/BotLog.ts
-import { EmbedBuilder } from "discord.js";
+import { EmbedBuilder, ActionRowBuilder } from "discord.js";
 var _BotLog = class _BotLog {
   constructor() {
   }
@@ -310,10 +310,10 @@ var _BotLog = class _BotLog {
         if (logCh?.isTextBased()) {
           _BotLog.logChannel = logCh;
         } else {
-          Log.warn(`\u274C Log channel ${Bot.config.log.logChannelId} invalid`);
+          Log.warn(`Log channel ${Bot.config.log.logChannelId} invalid`);
         }
       } catch (error) {
-        Log.error(`\u274C Log channel fetch failed: ${error}`);
+        Log.error(`Log channel fetch failed: ${error}`);
       }
     }
     if (Bot.config.log?.errorChannelId) {
@@ -322,10 +322,10 @@ var _BotLog = class _BotLog {
         if (errorCh?.isTextBased()) {
           _BotLog.errorChannel = errorCh;
         } else {
-          Log.warn(`\u274C Error channel ${Bot.config.log.errorChannelId} invalid`);
+          Log.warn(`Error channel ${Bot.config.log.errorChannelId} invalid`);
         }
       } catch (error) {
-        Log.error(`\u274C Error channel fetch failed: ${error}`);
+        Log.error(`Error channel fetch failed: ${error}`);
       }
     }
   }
@@ -337,10 +337,16 @@ var _BotLog = class _BotLog {
     let msg;
     try {
       if (content instanceof EmbedBuilder) {
+        const text = content.data.description ?? content.data.title;
+        if (text) {
+          Log.info(text);
+        }
         msg = await channel.send({ embeds: [content] });
+      } else if (content instanceof ActionRowBuilder) {
+        msg = await channel.send({ components: [content] });
       } else {
         const timestamp = `\`${(/* @__PURE__ */ new Date()).toISOString()}\``;
-        msg = await channel.send(`${prefix.toUpperCase()} ${timestamp} ${content}`);
+        msg = await channel.send(`[${timestamp}] [${prefix.toUpperCase()}] ${content}`);
       }
     } catch (error) {
       Log.error(`Failed to send to Discord channel: ${error}`);
@@ -353,7 +359,7 @@ var _BotLog = class _BotLog {
   static async info(content) {
     const logConfig = Bot.config.log;
     if (!logConfig || logConfig.info.console) {
-      if (!(content instanceof EmbedBuilder)) {
+      if (typeof content == "string") {
         Log.info(content);
       }
     }
@@ -367,7 +373,7 @@ var _BotLog = class _BotLog {
   static async error(content) {
     const logConfig = Bot.config.log;
     if (!logConfig || logConfig.error.console) {
-      if (!(content instanceof EmbedBuilder)) {
+      if (typeof content == "string") {
         Log.error(content);
       }
     }
@@ -381,7 +387,7 @@ var _BotLog = class _BotLog {
   static async warn(content) {
     const logConfig = Bot.config.log;
     if (!logConfig || logConfig?.warn.console) {
-      if (!(content instanceof EmbedBuilder)) {
+      if (typeof content == "string") {
         Log.warn(content);
       }
     }
@@ -395,7 +401,7 @@ var _BotLog = class _BotLog {
   static async debug(content) {
     const logConfig = Bot.config.log;
     if (!logConfig || logConfig?.debug.console) {
-      if (!(content instanceof EmbedBuilder)) {
+      if (typeof content == "string") {
         Log.debug(content);
       }
     }
@@ -454,7 +460,8 @@ var EmbedColor = /* @__PURE__ */ ((EmbedColor3) => {
 })(EmbedColor || {});
 var EmbedManager = class {
   static get BOT_ICON() {
-    return Bot.config.botIconUrl || "";
+    if (Bot.config.botIconUrl) return Bot.config.botIconUrl;
+    return Bot.client?.user?.displayAvatarURL({ forceStatic: false, size: 128 }) || "";
   }
   static get DEFAULT_COLOR() {
     return Bot.config.defaultEmbedColor || 6064856 /* default */;
@@ -464,11 +471,14 @@ var EmbedManager = class {
    */
   static create(color = null) {
     const embed = new EmbedBuilder2().setColor(color ?? this.DEFAULT_COLOR).setTimestamp(/* @__PURE__ */ new Date());
-    if (this.BOT_ICON && Bot.config.botName) {
-      embed.setFooter({
-        text: Bot.config.botName,
-        iconURL: this.BOT_ICON
-      });
+    if (Bot.config.botName) {
+      const footer = {
+        text: Bot.config.botName
+      };
+      if (this.BOT_ICON) {
+        footer.iconURL = this.BOT_ICON;
+      }
+      embed.setFooter(footer);
     }
     return embed;
   }
@@ -476,7 +486,7 @@ var EmbedManager = class {
    * Creates simple embed with just description
    */
   static simple(description, color = null) {
-    return this.create(color).setTitle("").setDescription(description).setTimestamp(null);
+    return this.create(color).setDescription(description).setTimestamp(null);
   }
   /**
    * Creates error embed
@@ -565,13 +575,13 @@ import {
 
 // src/manager/builder/SendableComponentBuilder.ts
 import {
-  ActionRowBuilder,
+  ActionRowBuilder as ActionRowBuilder2,
   EmbedBuilder as EmbedBuilder3,
   MessageFlags as MessageFlags2
 } from "discord.js";
 var SendableComponentBuilder = class {
   static isSendableComponent(thing) {
-    return thing instanceof EmbedBuilder3 || thing instanceof ActionRowBuilder;
+    return thing instanceof EmbedBuilder3 || thing instanceof ActionRowBuilder2;
   }
   static build(base, content, components) {
     if (content) {
@@ -583,7 +593,7 @@ var SendableComponentBuilder = class {
         base.embeds = base.embeds || [];
         base.embeds.push(comp);
       }
-      if (comp instanceof ActionRowBuilder) {
+      if (comp instanceof ActionRowBuilder2) {
         base.components = base.components || [];
         base.components.push(comp);
       }
@@ -626,13 +636,13 @@ var BotMessage = class {
   static async send(channel, content, component) {
     try {
       if (!channel) {
-        Log.warn("Cannot send message: invalid channel");
+        Log.warn("Cannot send message: Invalid channel ID");
         return null;
       }
       if (typeof channel === "string") {
         const fetchedChannel = Bot.client.channels.cache.get(channel);
         if (!fetchedChannel?.isTextBased()) {
-          Log.warn(`Invalid channel ID: ${channel}`);
+          Log.warn(`Cannot send message : Invalid channel ID: ${channel}`);
           return null;
         }
         channel = fetchedChannel;
@@ -653,7 +663,7 @@ var BotMessage = class {
         } else if (component) {
           messageCreate = SendableComponentBuilder.buildMessage(component);
         } else {
-          throw new Error("content and component cannot be null at the same time");
+          throw new Error("Cannot send message : content and component cannot be null at the same time");
         }
       }
       try {
@@ -662,7 +672,7 @@ var BotMessage = class {
         throw e;
       }
     } catch (e) {
-      Log.error(`Failed to send message : ${e}`);
+      Log.error(`Cannot send message : ${e}`);
       return null;
     }
   }
@@ -682,11 +692,11 @@ var BotMessage = class {
       } else if (component) {
         messageCreate = SendableComponentBuilder.buildMessage(component);
       } else {
-        throw new Error("content and component cannot be null at the same time");
+        throw new Error("Cannot send message : content and component cannot be null at the same time");
       }
       return await targetUser.send(messageCreate);
     } catch (error) {
-      Log.error(`Failed to send message to ${user}: ${error}`);
+      Log.error(`Cannot send message to ${user}: ${error}`);
       return null;
     }
   }
@@ -835,7 +845,7 @@ var BotEnv = {
     return token;
   },
   get dev() {
-    return process.env.DEV === "true";
+    return !!process.env.DISCORD_BOT_DEV;
   },
   get clientId() {
     const token = process.env.DISCORD_BOT_CLIENTID;
@@ -1223,6 +1233,11 @@ var WebhookManager = class {
 // src/manager/guild/ChannelManager/GuildTextChannelManager.ts
 import { TextChannel as TextChannel4, ChannelType } from "discord.js";
 
+// src/manager/guild/ChannelManager/GuildChannelManager.ts
+import {
+  GuildChannel
+} from "discord.js";
+
 // src/manager/guild/ChannelManager/GuildMessageManager.ts
 var GuildMessageManager = class {
   /**
@@ -1325,13 +1340,10 @@ var _GuildChannelManager = class _GuildChannelManager {
     }
   }
   static async find(channelId) {
-    for (const guild of Bot.client.guilds.cache.values()) {
-      try {
-        const channel = await guild.channels.fetch(channelId);
-        if (channel) return channel;
-      } catch {
-      }
-    }
+    const cached = Bot.client.channels.cache.get(channelId);
+    if (cached && cached instanceof GuildChannel) return cached;
+    const channel = await Bot.client.channels.fetch(channelId);
+    if (channel && channel instanceof GuildChannel) return channel;
     Log.warn(`Channel ${channelId} not found in any guild`);
     return null;
   }
@@ -1507,7 +1519,7 @@ var ReactionManager = class {
 
 // src/manager/guild/GuildManager.ts
 import {
-  Guild as Guild2,
+  Guild as Guild3,
   VoiceChannel as VoiceChannel2,
   StageChannel as StageChannel2
 } from "discord.js";
@@ -1518,16 +1530,19 @@ var BasicUserManager = class {
   /**
    * Find member in specific guild
    */
-  static async findInGuild(guildId, memberId) {
-    try {
-      const guild = Bot.client.guilds.cache.get(guildId);
-      if (!guild) throw new Error(`Guild ${guildId} not found`);
-      const member = await guild.members.fetch({ user: memberId, force: true });
-      return member ?? null;
-    } catch (error) {
-      Log.error(`UserManager: Member ${memberId} not found in ${guildId}`);
-      return null;
+  static async findInGuild(guild, memberId) {
+    let targetGuild = null;
+    if (typeof guild === "string") {
+      targetGuild = await GuildManager.find(guild);
+      if (!targetGuild) return null;
+    } else {
+      targetGuild = guild;
     }
+    const cached = targetGuild.members.cache.get(memberId);
+    if (cached) return cached;
+    const member = await targetGuild.members.fetch(memberId).catch(() => null);
+    if (!member) Log.error(`UserManager: Member ${memberId} not found in guild ${targetGuild.id}`);
+    return member;
   }
   /**
    * Check if user is still in guild
@@ -1582,13 +1597,13 @@ var BasicUserManager = class {
 };
 
 // src/manager/guild/GuildUserManager.ts
-import { Guild } from "discord.js";
+import { Guild as Guild2 } from "discord.js";
 import { setTimeout as setTimeout2 } from "timers/promises";
 var MAX_NICKNAME_LENGTH = 32;
 var GuildUserManager = class extends BasicUserManager {
   static async find(userId, guild) {
     try {
-      if (guild instanceof Guild) {
+      if (guild instanceof Guild2) {
         return await guild.members.fetch(userId);
       } else {
         return await (await GuildManager.find(guild)).members.fetch(userId);
@@ -1622,7 +1637,7 @@ var GuildUserManager = class extends BasicUserManager {
    */
   static async isBanned(guildId, userId) {
     try {
-      const guild = Bot.client.guilds.cache.get(guildId);
+      const guild = await GuildManager.find(guildId);
       if (!guild) {
         Log.warn(`Guild ${guildId} not found`);
         return false;
@@ -1639,13 +1654,9 @@ var GuildUserManager = class extends BasicUserManager {
    */
   static async deconnectFromVoice(guildId, memberId) {
     try {
-      const guild = Bot.client.guilds.cache.get(guildId);
-      if (!guild) {
-        throw new Error(`Guild ${guildId} not found`);
-      }
-      const member = await guild.members.fetch(memberId);
-      if (!member.voice.channel) {
-        throw new Error(`Member ${memberId} is not in a voice channel`);
+      const member = await GuildManager.user.findInGuild(guildId, memberId);
+      if (!member || !member.voice.channel) {
+        throw new Error(`Member ${memberId} not found or not in a voice channel`);
       }
       await member.voice.disconnect();
       Log.info(`Disconnected member ${memberId} from voice in guild ${guildId}`);
@@ -1659,9 +1670,10 @@ var GuildUserManager = class extends BasicUserManager {
    */
   static async isInVoice(memberId, guildId) {
     try {
-      const guild = Bot.client.guilds.cache.get(guildId);
-      if (!guild) return false;
-      const member = await guild.members.fetch(memberId);
+      const member = await GuildManager.user.findInGuild(guildId, memberId);
+      if (!member) {
+        throw new Error(`User ${guildId} not found`);
+      }
       return member.voice.channelId !== null;
     } catch (error) {
       Log.debug(`Member ${memberId} not found or not in voice in guild ${guildId}`);
@@ -1673,9 +1685,10 @@ var GuildUserManager = class extends BasicUserManager {
    */
   static async mute(guildId, memberId, reason) {
     try {
-      const guild = Bot.client.guilds.cache.get(guildId);
-      if (!guild) throw new Error(`Guild ${guildId} not found`);
-      const member = await guild.members.fetch(memberId);
+      const member = await GuildManager.user.findInGuild(guildId, memberId);
+      if (!member) {
+        throw new Error(`User ${guildId} not found`);
+      }
       await member.voice.setMute(true, reason);
       Log.info(`Server muted ${memberId} in guild ${guildId}: ${reason || "No reason"}`);
     } catch (error) {
@@ -1688,9 +1701,10 @@ var GuildUserManager = class extends BasicUserManager {
    */
   static async unmute(guildId, memberId, reason) {
     try {
-      const guild = Bot.client.guilds.cache.get(guildId);
-      if (!guild) throw new Error(`Guild ${guildId} not found`);
-      const member = await guild.members.fetch(memberId);
+      const member = await GuildManager.user.findInGuild(guildId, memberId);
+      if (!member) {
+        throw new Error(`User ${guildId} not found`);
+      }
       await member.voice.setMute(false, reason);
       Log.info(`Server unmuted ${memberId} in guild ${guildId}: ${reason || "No reason"}`);
     } catch (error) {
@@ -1703,9 +1717,10 @@ var GuildUserManager = class extends BasicUserManager {
    */
   static async deafen(guildId, memberId, reason) {
     try {
-      const guild = Bot.client.guilds.cache.get(guildId);
-      if (!guild) throw new Error(`Guild ${guildId} not found`);
-      const member = await guild.members.fetch(memberId);
+      const member = await GuildManager.user.findInGuild(guildId, memberId);
+      if (!member) {
+        throw new Error(`User ${guildId} not found`);
+      }
       await member.voice.setDeaf(true, reason);
       Log.info(`Server deafened ${memberId} in guild ${guildId}: ${reason || "No reason"}`);
     } catch (error) {
@@ -1718,9 +1733,10 @@ var GuildUserManager = class extends BasicUserManager {
    */
   static async undeafen(guildId, memberId, reason) {
     try {
-      const guild = Bot.client.guilds.cache.get(guildId);
-      if (!guild) throw new Error(`Guild ${guildId} not found`);
-      const member = await guild.members.fetch(memberId);
+      const member = await GuildManager.user.findInGuild(guildId, memberId);
+      if (!member) {
+        throw new Error(`User ${guildId} not found`);
+      }
       await member.voice.setDeaf(false, reason);
       Log.info(`Server undeafened ${memberId} in guild ${guildId}: ${reason || "No reason"}`);
     } catch (error) {
@@ -1733,9 +1749,10 @@ var GuildUserManager = class extends BasicUserManager {
    */
   static async timeout(guildId, memberId, duration, reason) {
     try {
-      const guild = Bot.client.guilds.cache.get(guildId);
-      if (!guild) throw new Error(`Guild ${guildId} not found`);
-      const member = await guild.members.fetch(memberId);
+      const member = await GuildManager.user.findInGuild(guildId, memberId);
+      if (!member) {
+        throw new Error(`User ${guildId} not found`);
+      }
       const expires = Date.now() + duration;
       await member.timeout(expires, reason);
       Log.info(`Timed out ${memberId} for ${duration}ms in guild ${guildId}: ${reason || "No reason"}`);
@@ -1749,9 +1766,10 @@ var GuildUserManager = class extends BasicUserManager {
    */
   static async untimeout(guildId, memberId, reason) {
     try {
-      const guild = Bot.client.guilds.cache.get(guildId);
-      if (!guild) throw new Error(`Guild ${guildId} not found`);
-      const member = await guild.members.fetch(memberId);
+      const member = await GuildManager.user.findInGuild(guildId, memberId);
+      if (!member) {
+        throw new Error(`User ${guildId} not found`);
+      }
       await member.timeout(null, reason);
       Log.info(`Untimed out ${memberId} in guild ${guildId}: ${reason || "No reason"}`);
     } catch (error) {
@@ -1764,9 +1782,10 @@ var GuildUserManager = class extends BasicUserManager {
    */
   static async kick(guildId, memberId, reason) {
     try {
-      const guild = Bot.client.guilds.cache.get(guildId);
-      if (!guild) throw new Error(`Guild ${guildId} not found`);
-      const member = await guild.members.fetch(memberId);
+      const member = await GuildManager.user.findInGuild(guildId, memberId);
+      if (!member) {
+        throw new Error(`User ${guildId} not found`);
+      }
       await member.kick(reason);
       Log.info(`Kicked ${memberId} from guild ${guildId}: ${reason || "No reason"}`);
     } catch (error) {
@@ -1775,7 +1794,7 @@ var GuildUserManager = class extends BasicUserManager {
     }
   }
   static async ban(guildId, userId, banOption) {
-    const guild = Bot.client.guilds.cache.get(guildId);
+    const guild = await GuildManager.find(guildId);
     if (!guild) {
       throw new Error(`Guild ${guildId} not found`);
     }
@@ -1788,7 +1807,7 @@ var GuildUserManager = class extends BasicUserManager {
     }
   }
   static async unban(guildId, userId, reason) {
-    const guild = Bot.client.guilds.cache.get(guildId);
+    const guild = await GuildManager.find(guildId);
     if (!guild) {
       throw new Error(`Guild ${guildId} not found`);
     }
@@ -2149,7 +2168,7 @@ var GuildManager = class {
    */
   static async fetchAllMembers(guildId, MAX_ATTEMPTS = 3, RETRY_DELAY = Time.minute.MIN_05.toMilliseconds()) {
     let guild;
-    if (guildId instanceof Guild2) {
+    if (guildId instanceof Guild3) {
       guild = guildId;
     } else {
       let tmp = Bot.client.guilds.cache.get(guildId);
@@ -2233,18 +2252,17 @@ GuildManager.invite = InviteManager;
 // src/manager/direct/UserManager.ts
 var UserManager = class extends BasicUserManager {
   static async find(userId) {
-    try {
-      return await Bot.client.users.fetch(userId);
-    } catch (error) {
-      Log.error(`UserManager: Member ${userId} not found`);
-      return null;
-    }
+    const cached = Bot.client.users.cache.get(userId);
+    if (cached) return cached;
+    const user = await Bot.client.users.fetch(userId).catch(() => null);
+    if (!user) Log.error(`UserManager: User ${userId} not found`);
+    return user;
   }
 };
 
 // src/manager/interactions/ModalManager.ts
 import {
-  ActionRowBuilder as ActionRowBuilder2,
+  ActionRowBuilder as ActionRowBuilder3,
   ModalBuilder,
   TextInputBuilder,
   TextInputStyle
@@ -2278,7 +2296,7 @@ var ModalManager = class _ModalManager {
     const actionRows = [];
     for (const fieldJson of json.fields) {
       const input = this.fieldJsonToInput(fieldJson);
-      const row = new ActionRowBuilder2().addComponents(input);
+      const row = new ActionRowBuilder3().addComponents(input);
       actionRows.push(row);
     }
     return modal.addComponents(...actionRows);
@@ -2336,7 +2354,7 @@ var ModalManager = class _ModalManager {
 
 // src/manager/interactions/SelectMenuManager.ts
 import {
-  ActionRowBuilder as ActionRowBuilder3,
+  ActionRowBuilder as ActionRowBuilder4,
   StringSelectMenuBuilder,
   StringSelectMenuOptionBuilder,
   UserSelectMenuBuilder,
@@ -2367,7 +2385,7 @@ var SelectMenuManager = class {
    * Pagination menu
    */
   static paginated(customId, options, pageSize = 25) {
-    const row = new ActionRowBuilder3();
+    const row = new ActionRowBuilder4();
     for (let i = 0; i < options.length; i += pageSize) {
       const pageOptions = options.slice(i, i + pageSize);
       const menu = new StringSelectMenuBuilder().setCustomId(`${customId}_page_${Math.floor(i / pageSize)}`).setPlaceholder(`Page ${Math.floor(i / pageSize) + 1}`).addOptions(pageOptions.map((opt) => {
@@ -2429,7 +2447,7 @@ var SelectMenuManager = class {
    * ActionRow
    */
   static row(component) {
-    return new ActionRowBuilder3().addComponents(component);
+    return new ActionRowBuilder4().addComponents(component);
   }
   /**
    * Rows multiples (5 max)
@@ -2482,7 +2500,7 @@ var SimpleMutex = class {
 // package.json
 var package_default = {
   name: "@spatulox/simplediscordbot",
-  version: "1.0.33",
+  version: "1.0.34",
   author: "Spatulox",
   description: "Simple discord bot framework to set up a bot under 30 secondes",
   exports: {
@@ -2494,13 +2512,19 @@ var package_default = {
   scripts: {
     build: "rm -r dist/ && tsup",
     patch: "npm run build && npm version patch",
+    minor: "npm run build && npm version minor",
+    major: "npm run build && npm version major",
+    premajor: "npm run build && npm version premajor",
+    "premajor:alpha": "npm run build && npm version premajor --preid=alpha",
     pub: "npm run patch && npm publish --access public",
+    "pub:major": "npm run major && npm publish --access public",
+    "pub:alpha": "npm run premajor:alpha && npm publish --tag alpha --access public",
     "test-pack": "npm run patch && npm publish --access public",
     dev: "nodemon --exec tsx src/test/index.ts"
   },
   license: "MIT",
   dependencies: {
-    "@spatulox/discord-interaction-manager": "^1.0.14",
+    "@spatulox/discord-interaction-manager": "^1.0.15",
     "discord.js": "^14.25.1"
   },
   devDependencies: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spatulox/simplediscordbot",
-  "version": "1.0.34",
+  "version": "1.0.35",
   "author": "Spatulox",
   "description": "Simple discord bot framework to set up a bot under 30 secondes",
   "exports": {
@@ -12,13 +12,19 @@
   "scripts": {
     "build": "rm -r dist/ && tsup",
     "patch": "npm run build && npm version patch",
+    "minor": "npm run build && npm version minor",
+    "major": "npm run build && npm version major",
+    "premajor": "npm run build && npm version premajor",
+    "premajor:alpha": "npm run build && npm version premajor --preid=alpha",
     "pub": "npm run patch && npm publish --access public",
+    "pub:major": "npm run major && npm publish --access public",
+    "pub:alpha": "npm run premajor:alpha && npm publish --tag alpha --access public",
     "test-pack": "npm run patch && npm publish --access public",
     "dev": "nodemon --exec tsx src/test/index.ts"
   },
   "license": "MIT",
   "dependencies": {
-    "@spatulox/discord-interaction-manager": "^1.0.14",
+    "@spatulox/discord-interaction-manager": "^1.0.15",
     "discord.js": "^14.25.1"
   },
   "devDependencies": {