Update delete.js

commands/delete.js

@@ -1,32 +1,59 @@
+let isDeleting = false;
+let cancelDelete = false;
+
 module.exports = {
   name: 'delete',
-  description: 'Delete a specified number of your messages with human-like delays.',
+  description: 'Delete a specified number of your messages or all messages from a server with human-like delays.',
   async execute(message, args, deleteTimeout) {
-    const deleteCount = parseInt(args[0], 10);
+    if (args[0] && args[0].toLowerCase() === 'cancel') {
-
+      cancelDelete = true;
-    if (isNaN(deleteCount) || deleteCount <= 0) {
+      const cancelMsg = await message.channel.send('Delete operation canceled.');
-      const errorMsg = await message.channel.send('Please provide a valid number of messages to delete.');
+      setTimeout(() => cancelMsg.delete().catch(console.error), deleteTimeout);
-      setTimeout(() => errorMsg.delete().catch(console.error), deleteTimeout);
       return;
     }
 
+    if (isDeleting) {
+      const inProgressMsg = await message.channel.send('A delete operation is already in progress. Please wait or cancel it with `.delete cancel`.');
+      setTimeout(() => inProgressMsg.delete().catch(console.error), deleteTimeout);
+      return;
+    }
+
+    isDeleting = true;
+    cancelDelete = false;
+
+    const deleteCount = parseInt(args[0], 10);
+    const targetGuildId = args[1];
+
+    if (!isNaN(deleteCount) && deleteCount > 0) {
+      await deleteMessagesFromChannel(message, deleteCount, deleteTimeout);
+    } else if (targetGuildId) {
+      await deleteMessagesFromServer(message, targetGuildId, deleteTimeout);
+    } else {
+      const errorMsg = await message.channel.send('Please provide a valid number of messages or server ID.');
+      setTimeout(() => errorMsg.delete().catch(console.error), deleteTimeout);
+    }
+
+    isDeleting = false;
+  },
+};
+
+async function deleteMessagesFromChannel(message, deleteCount, deleteTimeout) {
   const getRandomDelay = () => Math.floor(Math.random() * (3000 - 1000 + 1)) + 1000;
-
   const getBatchDelay = () => Math.floor(Math.random() * (10000 - 5000 + 1)) + 5000;
-
   const BATCH_SIZE = 10;
 
   try {
     let remainingMessages = deleteCount;
 
-      while (remainingMessages > 0) {
+    while (remainingMessages > 0 && !cancelDelete) {
       const fetchLimit = Math.min(remainingMessages, BATCH_SIZE);
       const messages = await message.channel.messages.fetch({ limit: fetchLimit + 1 });
 
       const filteredMessages = messages.filter(msg => msg.author.id === message.author.id);
       for (const msg of filteredMessages.values()) {
+        if (cancelDelete) return;
         try {
-            if (msg.deletable) {
+          if (msg.deletable && !msg.deleted) {
             const delay = getRandomDelay();
             await new Promise(resolve => setTimeout(resolve, delay));
             await msg.delete().catch(err => {
@@ -42,7 +69,7 @@ module.exports = {
 
       remainingMessages -= filteredMessages.size;
 
-        if (remainingMessages > 0) {
+      if (remainingMessages > 0 && !cancelDelete) {
         const batchDelay = getBatchDelay();
         await new Promise(resolve => setTimeout(resolve, batchDelay));
       }
@@ -52,5 +79,63 @@ module.exports = {
     const errorMsg = await message.channel.send('There was an error while trying to delete messages.');
     setTimeout(() => errorMsg.delete().catch(console.error), deleteTimeout);
   }
-  },
+}
-};
+
+async function deleteMessagesFromServer(message, guildId, deleteTimeout) {
+  const guild = message.client.guilds.cache.get(guildId);
+
+  if (!guild) {
+    const errorMsg = await message.channel.send('I am not in the server with the specified ID.');
+    setTimeout(() => errorMsg.delete().catch(console.error), deleteTimeout);
+    return;
+  }
+
+  const getRandomDelay = () => Math.floor(Math.random() * (3000 - 1000 + 1)) + 1000;
+  const getBatchDelay = () => Math.floor(Math.random() * (10000 - 5000 + 1)) + 5000;
+  const BATCH_SIZE = 10;
+
+  try {
+    const channels = guild.channels.cache.filter(channel => channel.isText());
+    for (const [channelId, channel] of channels) {
+      if (cancelDelete) return;
+      let hasMoreMessages = true;
+      while (hasMoreMessages && !cancelDelete) {
+        const messages = await channel.messages.fetch({ limit: BATCH_SIZE });
+
+        if (messages.size === 0) {
+          hasMoreMessages = false;
+          continue;
+        }
+
+        const filteredMessages = messages.filter(msg => msg.author.id === message.author.id);
+        for (const msg of filteredMessages.values()) {
+          if (cancelDelete) return;
+          try {
+            if (msg.deletable && !msg.deleted) {
+              const delay = getRandomDelay();
+              await new Promise(resolve => setTimeout(resolve, delay));
+              await msg.delete().catch(err => {
+                if (err.code !== 10008) {
+                  console.error('Failed to delete message:', err);
+                }
+              });
+            }
+          } catch (error) {
+            console.error('Error deleting message:', error);
+          }
+        }
+
+        if (filteredMessages.size < BATCH_SIZE) {
+          hasMoreMessages = false;
+        } else {
+          const batchDelay = getBatchDelay();
+          await new Promise(resolve => setTimeout(resolve, batchDelay));
+        }
+      }
+    }
+  } catch (error) {
+    console.error('Failed to delete messages in the server:', error);
+    const errorMsg = await message.channel.send('There was an error while trying to delete messages from the server.');
+    setTimeout(() => errorMsg.delete().catch(console.error), deleteTimeout);
+  }
+}