diff --git a/cmds/moderation/eventlog.js b/cmds/moderation/eventlog.js index 9bc6acf..f7ce21a 100644 --- a/cmds/moderation/eventlog.js +++ b/cmds/moderation/eventlog.js @@ -214,29 +214,6 @@ module.exports = class eventlog extends commando.Command { } } } - async function resultEmbed(the) { - const emb = defaultImageEmbed(msg, null, "Event Log Channels Configuration"); - emb - .setDescription(`Set configuration using \`\`\`js\n${msg.guild.commandPrefix + the.name} [--rm] -- \`\`\`**Categories:** \`\`\`js\n[MESSAGE[EDIT, DELETE]: --[e, d] IGNORE: -i, JOIN: --j, LEAVE: --l, MEMBER: --p, MEMBERROLE: --mr, BAN: --b, UNBAN: --u, GUILD: --g, ROLE: --r, CHANNEL: --c, EMOJI: --em, INVITE: --i]\`\`\``) - .addField(`Message Edit`, eventChannels?.mesEd?.channel ? `<#${eventChannels?.mesEd.channel}>\n**Ignores:** ${eventChannels?.mesEd?.ignore?.length > 0 ? - "<#" + eventChannels?.mesEd.ignore.join(">, <#") + ">" : "None"}` - : "Not set", true) - .addField(`Message Delete`, eventChannels?.mesDel?.channel ? `<#${eventChannels?.mesDel.channel}>\n**Ignores:** ${eventChannels?.mesDel?.ignore?.length > 0 ? - "<#" + eventChannels?.mesDel.ignore.join(">, <#") + ">" : "None"}` - : "Not set", true) - .addField(`Member Join`, eventChannels?.join ? `<#${eventChannels.join}>` : "Not set", true) - .addField(`Member Leave`, eventChannels?.leave ? `<#${eventChannels.leave}>` : "Not set", true) - .addField(`Member Profile Updates`, eventChannels?.member ? `<#${eventChannels?.member}>` : "Not set", true) - .addField(`Member Role Updates`, eventChannels?.memberRole ? `<#${eventChannels?.memberRole}>` : "Not set", true) - .addField(`Member Ban`, eventChannels?.ban ? `<#${eventChannels?.ban}>` : "Not set", true) - .addField(`Member Unban`, eventChannels?.unban ? `<#${eventChannels?.unban}>` : "Not set", true) - .addField(`Server Updates`, eventChannels?.guild ? `<#${eventChannels?.guild}>` : "Not set", true) - .addField(`Server Role Updates`, eventChannels?.role ? `<#${eventChannels?.role}>` : "Not set", true) - .addField(`Server Channels Updates`, eventChannels?.channel ? `<#${eventChannels?.channel}>` : "Not set", true) - .addField(`Server Emoji Updates`, eventChannels?.emote ? `<#${eventChannels?.emote}>` : "Not set", true) - .addField(`Server Invites`, eventChannels?.invite ? `<#${eventChannels?.invite}>` : "Not set", true); - return emb; - } eventChannels = { join: joinlog ?? eventChannels?.join, leave: leavelog ?? eventChannels?.leave, @@ -264,5 +241,29 @@ module.exports = class eventlog extends commando.Command { report += "\n**SUMMARY:**"; } return trySend(this.client, msg, (await resultEmbed(this)).setDescription(report.slice(0, 2048))); + + async function resultEmbed(the) { + const emb = defaultImageEmbed(msg, null, "Event Log Channels Configuration"); + emb + .setDescription(`Set configuration using \`\`\`js\n${msg.guild.commandPrefix + the.name} [--rm] -- \`\`\`**Categories:** \`\`\`js\n[MESSAGE[EDIT, DELETE]: --[e, d] IGNORE: -i, JOIN: --j, LEAVE: --l, MEMBER: --p, MEMBERROLE: --mr, BAN: --b, UNBAN: --u, GUILD: --g, ROLE: --r, CHANNEL: --c, EMOJI: --em, INVITE: --i]\`\`\``) + .addField(`Message Edit`, eventChannels?.mesEd?.channel ? `<#${eventChannels?.mesEd.channel}>\n**Ignores:** ${eventChannels?.mesEd?.ignore?.length > 0 ? + "<#" + eventChannels?.mesEd.ignore.join(">, <#") + ">" : "None"}` + : "Not set", true) + .addField(`Message Delete`, eventChannels?.mesDel?.channel ? `<#${eventChannels?.mesDel.channel}>\n**Ignores:** ${eventChannels?.mesDel?.ignore?.length > 0 ? + "<#" + eventChannels?.mesDel.ignore.join(">, <#") + ">" : "None"}` + : "Not set", true) + .addField(`Member Join`, eventChannels?.join ? `<#${eventChannels.join}>` : "Not set", true) + .addField(`Member Leave`, eventChannels?.leave ? `<#${eventChannels.leave}>` : "Not set", true) + .addField(`Member Profile Updates`, eventChannels?.member ? `<#${eventChannels?.member}>` : "Not set", true) + .addField(`Member Role Updates`, eventChannels?.memberRole ? `<#${eventChannels?.memberRole}>` : "Not set", true) + .addField(`Member Ban`, eventChannels?.ban ? `<#${eventChannels?.ban}>` : "Not set", true) + .addField(`Member Unban`, eventChannels?.unban ? `<#${eventChannels?.unban}>` : "Not set", true) + .addField(`Server Updates`, eventChannels?.guild ? `<#${eventChannels?.guild}>` : "Not set", true) + .addField(`Server Role Updates`, eventChannels?.role ? `<#${eventChannels?.role}>` : "Not set", true) + .addField(`Server Channels Updates`, eventChannels?.channel ? `<#${eventChannels?.channel}>` : "Not set", true) + .addField(`Server Emoji Updates`, eventChannels?.emote ? `<#${eventChannels?.emote}>` : "Not set", true) + .addField(`Server Invites`, eventChannels?.invite ? `<#${eventChannels?.invite}>` : "Not set", true); + return emb; + } } }; \ No newline at end of file diff --git a/config copy.json b/config copy.json deleted file mode 100644 index be86175..0000000 --- a/config copy.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "invite": "https://discord.com/oauth2/authorize?client_id=788006279837909032&scope=bot&permissions=8", - "token": "", - "errLogChannel": "822877910138224660", - "randomColors": [ - 12357519, - 16711935, - 128, - 32896, - 15277667, - "00ff00", - "ff0000", - "ff94f2", - "f1e40f", - "ff8c00", - "a0522d", - 3447003, - "0fffff", - "803c9d", - "faa775", - "000000", - 16777214 - ], - "defaultErrorLogChannel":"822877910138224660", - "mongoServer":"mongodb://localhost:27017" -} diff --git a/resources/functions.js b/resources/functions.js index ca50ad6..4559f1b 100644 --- a/resources/functions.js +++ b/resources/functions.js @@ -263,7 +263,7 @@ function defaultImageEmbed(msg, image, title, footerQuote) { if (!footerQuote) footerQuote = (msg.guild ?? msg.author).DB.defaultEmbed?.footerQuote || ""; const emb = new MessageEmbed() .setImage(image) - .setColor(msg.guild ? getColor(msg.member?.displayColor) : randomColors[Math.floor(Math.random() * randomColors.length)]) + .setColor(msg.guild ? getColor((msg.member || msg).displayColor) : randomColors[Math.floor(Math.random() * randomColors.length)]) .setFooter(footerQuote); if (title) emb.setTitle(title); return emb;