Supositware/Haha-Yes
2
1
Fork 1
Code Issues Pull requests Projects Releases Activity

Compare commits

base: Supositware:e6dca692ed35861e3e6bf6b51d10a37c305a5982
Branches Tags
Supositware:Slash-V14
Supositware:slash
Supositware:akairo
Supositware:Commando
..
compare: Supositware:ceafee82878e30e8a69d23a7f9e14cd2654b2cd7
Branches Tags
Supositware:Slash-V14
Supositware:slash
Supositware:akairo
Supositware:Commando

No commits in common. "e6dca692ed35861e3e6bf6b51d10a37c305a5982" and "ceafee82878e30e8a69d23a7f9e14cd2654b2cd7" have entirely different histories.
e6dca692ed ... ceafee8287

3 changed files with 28 additions and 24 deletions
Show stats Expand all files Collapse all files

12
events/client/interactionCreate.js
View file

@ -71,16 +71,18 @@ export default {
// Check if the limit of parallel execution has been reached
if (command.parallelLimit) {
const doParallelLimit = await ratelimiter.checkParallel(interaction.user, commandName, command);
console.log('Command has a parallel limit');
const doParallelLimit = ratelimiter.checkParallel(interaction.user, commandName, command);
console.log(doParallelLimit.limited);
if (doParallelLimit.limited) {
return await interaction.reply({ content: doParallelLimit.msg, ephemeral: true });
return await interaction.reply({ content: doParallelLimit, ephemeral: true });
}
ratelimiter.addParallel(commandName);
}
// Check the ratelimit
const doRateLimit = await ratelimiter.check(interaction.user, commandName, command);
const doRateLimit = ratelimiter.check(interaction.user, commandName, command);
if (doRateLimit) {
return interaction.reply({ content: doRateLimit, ephemeral: true });
@ -107,8 +109,8 @@ export default {
}
await command.execute(interaction, args, client)
.then(async () => {
const hasPrallelLimit = await ratelimiter.checkParallel(interaction.user, commandName, command);
.then(() => {
const hasPrallelLimit = ratelimiter.checkParallel(interaction.user, commandName, command);
if (hasPrallelLimit) ratelimiter.removeParallel(commandName);
});
}

14
events/client/messageCreate.js
View file

@ -303,7 +303,7 @@ export default {
const isOptOut = await db.optout.findOne({ where: { userID: message.author.id } });
const timestamp = new Date();
console.log(`[${timestamp.toISOString()}] \x1b[33m${ isOptOut ? 'A user' : `${userTag} (${userID})`}\x1b[0m launched command \x1b[33m${commandName}\x1b[0m using prefix`);
console.log(`[${timestamp.toISOString()}] \x1b[33m${ isOptOut ? 'A user' : `${userTag} (${userID})`}\x1b[0m launched command \x1b[33m${commandName}\x1b[0m using slash`);
// Owner only check
@ -333,16 +333,18 @@ export default {
// Check if the limit of parallel execution has been reached
if (command.parallelLimit) {
const doParallelLimit = await ratelimiter.checkParallel(message.author, commandName, command);
console.log('Command has a parallel limit');
const doParallelLimit = ratelimiter.checkParallel(message.author, commandName, command);
console.log(doParallelLimit.limited);
if (doParallelLimit.limited) {
return await message.reply({ content: doParallelLimit.msg, ephemeral: true });
return await message.reply({ content: doParallelLimit, ephemeral: true });
}
ratelimiter.addParallel(commandName);
}
// Check the ratelimit
const doRateLimit = await ratelimiter.check(message.author, commandName, command);
const doRateLimit = ratelimiter.check(message.author, commandName, command);
if (doRateLimit) {
return message.reply({ content: doRateLimit, ephemeral: true });
@ -432,8 +434,8 @@ export default {
}
await command.execute(message, args, client)
.then(async () => {
const hasPrallelLimit = await ratelimiter.checkParallel(message.author, commandName, command);
.then(() => {
const hasPrallelLimit = ratelimiter.checkParallel(message.author, commandName, command);
if (hasPrallelLimit) ratelimiter.removeParallel(commandName);
});
}

26
utils/ratelimiter.js
View file

@ -10,15 +10,13 @@ export default {
removeParallel,
checkParallel,
};
async function check(user, commandName, commands) {
function check(user, commandName, commands) {
const userID = user.id;
const userTag = user.username;
// Don't apply the rate limit to bot owner
if (NODE_ENV !== 'development') {
if (user.id === ownerId) {
return false;
}
if (userID === ownerId) {
return false;
}
if (!ratelimit[userID]) {
@ -40,11 +38,13 @@ async function check(user, commandName, commands) {
const hours = Math.floor(minutes / 60);
const dateString = `${hours > 0 ? ` ${Math.floor(hours)} hours` : ''}${minutes > 0 ? ` ${Math.floor(minutes % 60)} minutes` : ''}${seconds > 0 ? ` ${Math.floor(seconds % 60)} seconds` : ''}`;
const isOptOut = await db.optout.findOne({ where: { userID: userID } });
const timestamp = new Date();
console.log(`[${timestamp.toISOString()}] \x1b[33m${ isOptOut ? 'A user' : `${userTag} (${userID})`}\x1b[0m is rate limited on \x1b[33m${commandName}\x1b[0m for${dateString}.`);
const isOptOut = db.optout.findOne({ where: { userID: userID } });
if (isOptOut) {
console.log(`A user is rate limited on \x1b[33m${commandName}\x1b[0m for${dateString}.`);
}
else {
console.log(`\x1b[33m${userTag} (${userID})\x1b[0m is rate limited on \x1b[33m${commandName}\x1b[0m for${dateString}.`);
}
return `You are being rate limited. You can try again in${dateString}.`;
}
}
@ -58,7 +58,7 @@ async function check(user, commandName, commands) {
return false;
}
async function addParallel(commandName) {
function addParallel(commandName) {
// console.log(`[ADD] Adding parallel to ${commandName}`);
if (!parallelLimit[commandName]) parallelLimit[commandName] = 0;
@ -69,7 +69,7 @@ async function addParallel(commandName) {
parallelLimit[commandName] = prevNumber + 1;
}
async function removeParallel(commandName) {
function removeParallel(commandName) {
// console.log(`[REMOVE] Removing parallel to ${commandName}`);
// This shouldn't be possible
@ -83,7 +83,7 @@ async function removeParallel(commandName) {
// console.log(`[REMOVE] current parallel limit: ${JSON.stringify(parallelLimit)}`);
}
async function checkParallel(user, commandName, command) {
function checkParallel(user, commandName, command) {
// Don't apply the rate limit to bot owner
if (NODE_ENV !== 'development') {
if (user.id === ownerId) {