From d73d1b4798c37bffb4690d26321c95b676a7b86c Mon Sep 17 00:00:00 2001 From: "Navy.gif" Date: Fri, 2 Dec 2022 11:05:40 +0200 Subject: [PATCH] fixes --- src/structure/client/ModerationManager.js | 3 +-- src/structure/client/Resolver.js | 10 ++++++++++ src/structure/components/observers/GuildLogging.js | 2 +- src/structure/components/settings/utility/Selfrole.js | 2 +- src/utilities/Logger.js | 1 - 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/structure/client/ModerationManager.js b/src/structure/client/ModerationManager.js index 5fb6bfa..13bd93f 100644 --- a/src/structure/client/ModerationManager.js +++ b/src/structure/client/ModerationManager.js @@ -340,8 +340,7 @@ class ModerationManager { guild: info.wrapper, channel: info.channel, executor: info.executor, - reason: stripIndents`${reason} - *${wrapper.format('INFRACTION_AUTOMODESCALATION')}*`, + reason: stripIndents`${reason}`, // *${wrapper.format('INFRACTION_AUTOMODESCALATION')}* duration: response.escalation.length ? response.escalation.length * 1000 : null, // info.duration, data: info.data, points, diff --git a/src/structure/client/Resolver.js b/src/structure/client/Resolver.js index 94a638b..047389b 100644 --- a/src/structure/client/Resolver.js +++ b/src/structure/client/Resolver.js @@ -377,6 +377,16 @@ class Resolver { } + // async resolveAny(resolveables = [], strict, guild) { + + // if (!resolveables.length) return Promise.resolve([]); + // const resolvers = [this.resolveUser, this.resolveMember, this.resolveRole, this.resolveChannel]; + // for (const resolveable of resolveables) { + + // } + + // } + resolveBoolean(input) { // Ensure input is a string input = `${input}`.toLowerCase(); diff --git a/src/structure/components/observers/GuildLogging.js b/src/structure/components/observers/GuildLogging.js index a7a235c..64b7a88 100644 --- a/src/structure/components/observers/GuildLogging.js +++ b/src/structure/components/observers/GuildLogging.js @@ -92,7 +92,7 @@ class GuildLogger extends Observer { const settings = await guild.settings(); const { messages } = settings; - if (!messages.channel) return; + if (!messages.channel || !messages.enabled) return; const logChannel = await guild.resolveChannel(messages.channel); if (!logChannel) return; diff --git a/src/structure/components/settings/utility/Selfrole.js b/src/structure/components/settings/utility/Selfrole.js index 396aef7..ddeef40 100644 --- a/src/structure/components/settings/utility/Selfrole.js +++ b/src/structure/components/settings/utility/Selfrole.js @@ -43,7 +43,7 @@ class SelfroleSetting extends Setting { if (!roles && !channel && !text) return { error: true, index: 'SETTING_MISSING_ARG' }; const { guild } = invoker; - if (roles.value === 'list') return this.list(setting.roles, invoker, 'roles'); + if (roles?.value === 'list') return this.list(setting.roles, invoker, 'roles'); if (roles) { const response = await this._prompt(invoker, { diff --git a/src/utilities/Logger.js b/src/utilities/Logger.js index ceed8de..6e296a4 100644 --- a/src/utilities/Logger.js +++ b/src/utilities/Logger.js @@ -44,7 +44,6 @@ class Logger { this.transport(message, { ...opts, type: 'status' }); } - } module.exports = Logger; \ No newline at end of file