diff --git a/events/client/interactionCreate.js b/events/client/interactionCreate.js index 38a2177..af09d61 100644 --- a/events/client/interactionCreate.js +++ b/events/client/interactionCreate.js @@ -27,7 +27,15 @@ export default { if (!command) return; - console.log(`\x1b[33m${userTag} (${userID})\x1b[0m launched command \x1b[33m${commandName}\x1b[0m with slash`); + const isOptOut = await db.optout.findOne({ where: { userID: interaction.user.id } }); + + if (isOptOut) { + console.log(`A user launched command \x1b[33m${commandName}\x1b[0m with slash`); + } + else { + console.log(`\x1b[33m${userTag} (${userID})\x1b[0m launched command \x1b[33m${commandName}\x1b[0m with slash`); + } + // Owner only check if (command.ownerOnly && interaction.user.id !== ownerId) { @@ -74,6 +82,10 @@ export default { args[arg.name] = payload; }); + if (!isOptOut) { + console.log(`\x1b[33m${commandName}\x1b[0m with args ${JSON.stringify(args)}`); + } + await command.execute(interaction, args, client); } catch (error) { diff --git a/events/client/messageCreate.js b/events/client/messageCreate.js index 67f9aa5..1b7dc1d 100644 --- a/events/client/messageCreate.js +++ b/events/client/messageCreate.js @@ -290,7 +290,14 @@ export default { const userTag = message.author.tag; const userID = message.author.id; - console.log(`\x1b[33m${userTag} (${userID})\x1b[0m launched command \x1b[33m${commandName}\x1b[0m with prefix`); + const isOptOut = await db.optout.findOne({ where: { userID: message.author.id } }); + + if (isOptOut) { + console.log(`A user launched command \x1b[33m${commandName}\x1b[0m with prefix`); + } + else { + console.log(`\x1b[33m${userTag} (${userID})\x1b[0m launched command \x1b[33m${commandName}\x1b[0m with prefix`); + } // Owner only check if (command.ownerOnly && message.author.id !== ownerId) { @@ -394,6 +401,11 @@ export default { args[payloadName] = payload; } + + if (!isOptOut) { + console.log(`\x1b[33m${commandName}\x1b[0m with args ${JSON.stringify(args)}`); + } + await command.execute(message, args, client); } catch (error) {