Update autodelete.js
This commit is contained in:
parent
13b31d4fc3
commit
a2acaa42f1
@ -4,11 +4,20 @@ let isProcessingQueue = false;
|
|||||||
let messageTimers = new Map();
|
let messageTimers = new Map();
|
||||||
let ignoredMessages = new Set();
|
let ignoredMessages = new Set();
|
||||||
let isFirstDeletion = true;
|
let isFirstDeletion = true;
|
||||||
|
let deletedMessages = new Set();
|
||||||
|
const CACHE_CLEANUP_INTERVAL = 30 * 60 * 1000;
|
||||||
|
|
||||||
const DELETION_DELAY = 5 * 60 * 1000;
|
const DELETION_DELAY = 5 * 60 * 1000;
|
||||||
const MIN_DELETE_INTERVAL = 2500;
|
const MIN_DELETE_INTERVAL = 2500;
|
||||||
const MAX_DELETE_INTERVAL = 3500;
|
const MAX_DELETE_INTERVAL = 3500;
|
||||||
|
|
||||||
|
setInterval(() => {
|
||||||
|
if (deletedMessages.size > 1000) {
|
||||||
|
console.log(`[AUTODELETE] Cleaning message cache (size: ${deletedMessages.size})`);
|
||||||
|
deletedMessages.clear();
|
||||||
|
}
|
||||||
|
}, CACHE_CLEANUP_INTERVAL);
|
||||||
|
|
||||||
const getRandomInterval = () => {
|
const getRandomInterval = () => {
|
||||||
return Math.floor(Math.random() * (MAX_DELETE_INTERVAL - MIN_DELETE_INTERVAL)) + MIN_DELETE_INTERVAL;
|
return Math.floor(Math.random() * (MAX_DELETE_INTERVAL - MIN_DELETE_INTERVAL)) + MIN_DELETE_INTERVAL;
|
||||||
};
|
};
|
||||||
@ -20,6 +29,19 @@ const processDeleteQueue = async () => {
|
|||||||
const messageToDelete = deleteQueue.shift();
|
const messageToDelete = deleteQueue.shift();
|
||||||
if (!messageToDelete) return;
|
if (!messageToDelete) return;
|
||||||
|
|
||||||
|
if (deletedMessages.has(messageToDelete.id)) {
|
||||||
|
console.log(`[AUTODELETE] Message ${messageToDelete.id} already deleted (cached), skipping`);
|
||||||
|
|
||||||
|
if (deleteQueue.length > 0 && isProcessingQueue) {
|
||||||
|
const nextInterval = getRandomInterval();
|
||||||
|
console.log(`[AUTODELETE] Next deletion in ${nextInterval}ms | Queue size: ${deleteQueue.length}`);
|
||||||
|
setTimeout(processDeleteQueue, nextInterval);
|
||||||
|
} else {
|
||||||
|
isProcessingQueue = false;
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const deleteDelay = Math.floor(Math.random() * 100) + 50;
|
const deleteDelay = Math.floor(Math.random() * 100) + 50;
|
||||||
await new Promise(resolve => setTimeout(resolve, deleteDelay));
|
await new Promise(resolve => setTimeout(resolve, deleteDelay));
|
||||||
console.log(`[AUTODELETE] Waited ${deleteDelay}ms before processing`);
|
console.log(`[AUTODELETE] Waited ${deleteDelay}ms before processing`);
|
||||||
@ -28,7 +50,8 @@ const processDeleteQueue = async () => {
|
|||||||
console.log(`[AUTODELETE] Checking message ${messageToDelete.id} existence${isFirstDeletion ? ' (first deletion)' : ''}`);
|
console.log(`[AUTODELETE] Checking message ${messageToDelete.id} existence${isFirstDeletion ? ' (first deletion)' : ''}`);
|
||||||
const exists = await messageToDelete.fetch().catch(() => null);
|
const exists = await messageToDelete.fetch().catch(() => null);
|
||||||
if (!exists) {
|
if (!exists) {
|
||||||
console.log(`[AUTODELETE] Message ${messageToDelete.id} no longer exists, skipping`);
|
console.log(`[AUTODELETE] Message ${messageToDelete.id} no longer exists, adding to cache`);
|
||||||
|
deletedMessages.add(messageToDelete.id);
|
||||||
isFirstDeletion = false;
|
isFirstDeletion = false;
|
||||||
if (deleteQueue.length > 0 && isProcessingQueue) {
|
if (deleteQueue.length > 0 && isProcessingQueue) {
|
||||||
const nextInterval = getRandomInterval();
|
const nextInterval = getRandomInterval();
|
||||||
@ -41,11 +64,19 @@ const processDeleteQueue = async () => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
await messageToDelete.delete().catch(() => {
|
await messageToDelete.delete().catch((error) => {
|
||||||
console.log(`[AUTODELETE] Couldn't delete message ${messageToDelete.id}`);
|
if (error.code === 10008) {
|
||||||
|
console.log(`[AUTODELETE] Message ${messageToDelete.id} already deleted, adding to cache`);
|
||||||
|
deletedMessages.add(messageToDelete.id);
|
||||||
|
} else {
|
||||||
|
console.log(`[AUTODELETE] Couldn't delete message ${messageToDelete.id}:`, error);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
console.log(`[AUTODELETE] Processed message ${messageToDelete.id}`);
|
if (!deletedMessages.has(messageToDelete.id)) {
|
||||||
|
deletedMessages.add(messageToDelete.id);
|
||||||
|
console.log(`[AUTODELETE] Processed and cached message ${messageToDelete.id}`);
|
||||||
|
}
|
||||||
isFirstDeletion = false;
|
isFirstDeletion = false;
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@ -71,8 +102,8 @@ const startQueueProcessing = () => {
|
|||||||
const handleNewMessage = (message) => {
|
const handleNewMessage = (message) => {
|
||||||
if (!isAutoDeleteActive || message.author.id !== message.client.user.id) return;
|
if (!isAutoDeleteActive || message.author.id !== message.client.user.id) return;
|
||||||
|
|
||||||
if (ignoredMessages.has(message.id)) {
|
if (ignoredMessages.has(message.id) || deletedMessages.has(message.id)) {
|
||||||
console.log(`[AUTODELETE] Skipping ignored message: ${message.id}`);
|
console.log(`[AUTODELETE] Skipping cached/ignored message: ${message.id}`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (message.content.startsWith('.autodelete')) {
|
if (message.content.startsWith('.autodelete')) {
|
||||||
@ -86,10 +117,12 @@ const handleNewMessage = (message) => {
|
|||||||
const timer = setTimeout(() => {
|
const timer = setTimeout(() => {
|
||||||
if (isAutoDeleteActive) {
|
if (isAutoDeleteActive) {
|
||||||
console.log(`[AUTODELETE] Timer completed for message: ${message.id}`);
|
console.log(`[AUTODELETE] Timer completed for message: ${message.id}`);
|
||||||
|
if (!deletedMessages.has(message.id)) {
|
||||||
deleteQueue.push(message);
|
deleteQueue.push(message);
|
||||||
messageTimers.delete(message.id);
|
messageTimers.delete(message.id);
|
||||||
startQueueProcessing();
|
startQueueProcessing();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}, DELETION_DELAY);
|
}, DELETION_DELAY);
|
||||||
|
|
||||||
messageTimers.set(message.id, timer);
|
messageTimers.set(message.id, timer);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user