1
0
mirror of https://github.com/toast-ts/Daggerbot-TS.git synced 2024-09-29 16:30:59 -04:00

Glad I didn't pull the untested changes to main bot.

This commit is contained in:
AnxietyisReal 2023-02-16 22:29:45 +11:00
parent 4c545fac07
commit 3a863f203f

View File

@ -16,6 +16,7 @@ export default {
if (client.bannedWords._content.some((x)=>msgarr.includes(x)) && !message.member.roles.cache.has(client.config.mainServer.roles.dcmod) && message.guildId == client.config.mainServer.id && !Whitelist.includes(message.channelId) && client.config.botSwitches.automod){ if (client.bannedWords._content.some((x)=>msgarr.includes(x)) && !message.member.roles.cache.has(client.config.mainServer.roles.dcmod) && message.guildId == client.config.mainServer.id && !Whitelist.includes(message.channelId) && client.config.botSwitches.automod){
automodded = true; automodded = true;
const threshold = 30000;
message.delete().catch(err=>console.log('bannedWords automod; msg got possibly deleted by another bot.')) message.delete().catch(err=>console.log('bannedWords automod; msg got possibly deleted by another bot.'))
message.channel.send('That word is banned here.').then((x)=>setTimeout(()=>x.delete(), 5000)); message.channel.send('That word is banned here.').then((x)=>setTimeout(()=>x.delete(), 5000));
if (client.repeatedMessages[message.author.id]){ if (client.repeatedMessages[message.author.id]){
@ -24,10 +25,7 @@ export default {
// reset timeout // reset timeout
clearTimeout(client.repeatedMessages[message.author.id].timeout); clearTimeout(client.repeatedMessages[message.author.id].timeout);
client.repeatedMessages[message.author.id].timeout = setTimeout(onTimeout, 30000); client.repeatedMessages[message.author.id].timeout = setTimeout(onTimeout, threshold);
// this is the time in which 4 messages have to be sent, in milliseconds (ms)
const threshold = 30000;
// message mustve been sent after (now - threshold), so purge those that were sent earlier // message mustve been sent after (now - threshold), so purge those that were sent earlier
client.repeatedMessages[message.author.id].data = client.repeatedMessages[message.author.id].data.filter((x, i)=>i >= Date.now() - threshold) client.repeatedMessages[message.author.id].data = client.repeatedMessages[message.author.id].data.filter((x, i)=>i >= Date.now() - threshold)
@ -39,41 +37,39 @@ export default {
// if a spammed message exists; // if a spammed message exists;
if (spammedMessage){ if (spammedMessage){
// mute
await client.punishments.addPunishment('mute', { time: '30m' }, (client.user as Discord.User).id, 'Automod; Banned words', message.author, message.member as Discord.GuildMember);
// clear their list of long messages
delete client.repeatedMessages[message.author.id]; delete client.repeatedMessages[message.author.id];
await client.punishments.addPunishment('mute', { time: '30m' }, (client.user as Discord.User).id, 'Automod; Banned words', message.author, message.member as Discord.GuildMember);
} }
} else { } else {
client.repeatedMessages[message.author.id] = new client.collection(); client.repeatedMessages[message.author.id] = {data: new client.collection(), timeout: setTimeout(onTimeout, threshold)}
client.repeatedMessages[message.author.id].data.set(message.createdTimestamp, {cont: 0, ch: message.channelId}); client.repeatedMessages[message.author.id].data.set(message.createdTimestamp, {cont: 0, ch: message.channelId});
// autodelete after 30 secs // autodelete after 30 secs
client.repeatedMessages[message.author.id].timeout = setTimeout(onTimeout, 30000); client.repeatedMessages[message.author.id].timeout = setTimeout(onTimeout, threshold);
} }
} }
if (message.content.toLowerCase().includes('discord.gg/') && !message.member.roles.cache.has(client.config.mainServer.roles.dcmod) && message.guildId == client.config.mainServer.id && !Whitelist.includes(message.channelId)) { if (message.content.toLowerCase().includes('discord.gg/') && !message.member.roles.cache.has(client.config.mainServer.roles.dcmod) && message.guildId == client.config.mainServer.id && !Whitelist.includes(message.channelId)) {
automodded = true; automodded = true;
const threshold = 60000;
message.delete().catch(err=>console.log('advertisement automod; msg got possibly deleted by another bot.')) message.delete().catch(err=>console.log('advertisement automod; msg got possibly deleted by another bot.'))
message.channel.send('Advertising other Discord servers is not allowed.').then(x=>setTimeout(()=>x.delete(), 10000)) message.channel.send('Advertising other Discord servers is not allowed.').then(x=>setTimeout(()=>x.delete(), 10000))
if (client.repeatedMessages[message.author.id]){ if (client.repeatedMessages[message.author.id]){
client.repeatedMessages[message.author.id].data.set(message.createdTimestamp,{cont:1,ch:message.channelId}); client.repeatedMessages[message.author.id].data.set(message.createdTimestamp,{cont:1,ch:message.channelId});
clearTimeout(client.repeatedMessages[message.author.id].timeout); clearTimeout(client.repeatedMessages[message.author.id].timeout);
client.repeatedMessages[message.author.id].timeout = setTimeout(onTimeout, 60000); client.repeatedMessages[message.author.id].timeout = setTimeout(onTimeout, threshold);
const threshold = 60000;
client.repeatedMessages[message.author.id].data = client.repeatedMessages[message.author.id].data.filter((x, i)=> i >= Date.now() - threshold) client.repeatedMessages[message.author.id].data = client.repeatedMessages[message.author.id].data.filter((x, i)=> i >= Date.now() - threshold)
const spammedMessage = client.repeatedMessages[message.author.id]?.data.find((x)=>{ const spammedMessage = client.repeatedMessages[message.author.id].data.find((x)=>{
return client.repeatedMessages[message.author.id].data.filter((y)=>x.cont === y.cont).size >= 4; return client.repeatedMessages[message.author.id].data.filter((y)=>x.cont === y.cont).size >= 4;
}); });
if (spammedMessage){ if (spammedMessage){
await client.punishments.addPunishment('mute', {time: '1h'}, (client.user as Discord.User).id, 'Automod; Discord advertisement', message.author, message.member as Discord.GuildMember);
delete client.repeatedMessages[message.author.id]; delete client.repeatedMessages[message.author.id];
await client.punishments.addPunishment('mute', {time: '1h'}, (client.user as Discord.User).id, 'Automod; Discord advertisement', message.author, message.member as Discord.GuildMember);
} }
}else{ }else{
client.repeatedMessages[message.author.id] = new client.collection(); client.repeatedMessages[message.author.id] = new client.collection();
client.repeatedMessages[message.author.id].data.set(message.createdTimestamp, {cont: 1, ch: message.channelId}); client.repeatedMessages[message.author.id].data.set(message.createdTimestamp, {cont: 1, ch: message.channelId});
client.repeatedMessages[message.author.id].timeout = setTimeout(onTimeout, 60000); client.repeatedMessages[message.author.id].timeout = setTimeout(onTimeout, threshold);
} }
} }