From 5c98376a8c51ce9f508d2bc12a1c8837e5f7338c Mon Sep 17 00:00:00 2001 From: ItzEmerald Date: Wed, 15 Jul 2020 02:16:15 +0100 Subject: [PATCH] RolePerms Update --- commands/BotSay.js | 21 +++++++----- commands/addUser.js | 68 ++++++++++++++++++++----------------- commands/announce.js | 6 ++-- commands/help.js | 8 +---- commands/helptest.js | 33 ++++++++++++++++++ commands/removeUser.js | 68 +++++++++++++++++++------------------ storage/SupportTickets.json | 2 +- storage/TicketID.json | 2 +- 8 files changed, 123 insertions(+), 85 deletions(-) create mode 100644 commands/helptest.js diff --git a/commands/BotSay.js b/commands/BotSay.js index 82f80bb..5a4b9dd 100644 --- a/commands/BotSay.js +++ b/commands/BotSay.js @@ -19,18 +19,23 @@ module.exports = { const NoPerms = new Discord.MessageEmbed() .setTitle("Invalid Permissions!") - .setDescription(`${supportbot.IncorrectPerms}\n\nRole Required: \`${supportbot.Staff}\``) + .setDescription(`${supportbot.IncorrectPerms}\n\nRole Required: \`${supportbot.Staff}\` or \`${supportbot.Admin}\``) .setColor(supportbot.WarningColour) - if (!message.member.roles.cache.has(SupportStaff.id )) + if (!message.member.roles.cache.has(SupportStaff.id || Admins.id)) { + + const BotSpeaks = agrs.join(" "); + + const Speaking = new Discord.MessageEmbed() + .setDescription(args.join) + .setColor(supportbot.EmbedColour) + message.channel.send({ embed: Speaking }) + + } else { + return message.channel.send({ embed: NoPerms }); - const BotSpeaks = agrs.join(" "); - - const Speaking = new Discord.MessageEmbed() - .setDescription(args.join) - .setColor(supportbot.EmbedColour) - message.channel.send({ embed: Speaking }) + } } diff --git a/commands/addUser.js b/commands/addUser.js index 6d32025..9a345de 100644 --- a/commands/addUser.js +++ b/commands/addUser.js @@ -19,42 +19,46 @@ module.exports = { const NoPerms = new Discord.MessageEmbed() .setTitle("Invalid Permissions!") - .setDescription(`${supportbot.IncorrectPerms}\n\nRole Required: \`${supportbot.Staff}\``) + .setDescription(`${supportbot.IncorrectPerms}\n\nRole Required: \`${supportbot.Staff}\` or \`${supportbot.Admin}\``) .setColor(supportbot.WarningColour) - if (!message.member.roles.cache.has(SupportStaff.id)) + if (!message.member.roles.cache.has(SupportStaff.id || Admins.id)) { + if (!message.channel.name.startsWith( `${supportbot.TicketChannel}-` )) { + const Exists = new Discord.MessageEmbed() + .setTitle("No Ticket Found!") + .setDescription(`${supportbot.NoValidTicket}`) + .setColor(supportbot.WarningColour); + message.channel.send({ embed: Exists }); + + return; + } + + let rUser = message.guild.member(message.mentions.users.first() || message.guild.members.cache.get(args[0])); + const UserNotExist = new Discord.MessageEmbed() + .setTitle("User Not Found!") + .setDescription(`${supportbot.UserNotFound}\n\nTry Again:\`${supportbot.Prefix}${supportbot.AddUser} \``) + .setColor(supportbot.ErrorColour) + + if (!rUser) return message.channel.send({ embed: UserNotExist }); + + message.channel.updateOverwrite(rUser, { + VIEW_CHANNEL: true, + CREATE_INVITE: false, + SEND_MESSAGES: true, + READ_MESSAGES: true + }); + + const Complete = new Discord.MessageEmbed() + .setTitle("User Added!") + .setDescription(supportbot.AddedUser.replace(/%user%/g, rUser.id)) + .setTimestamp() + .setColor(supportbot.EmbedColour) + message.channel.send({ embed: Complete }); + } else { + return message.channel.send({ embed: NoPerms }); - if (!message.channel.name.startsWith( `${supportbot.TicketChannel}-` )) { - const Exists = new Discord.MessageEmbed() - .setTitle("No Ticket Found!") - .setDescription(`${supportbot.NoValidTicket}`) - .setColor(supportbot.WarningColour); - message.channel.send({ embed: Exists }); + } - return; - } - - let rUser = message.guild.member(message.mentions.users.first() || message.guild.members.cache.get(args[0])); - const UserNotExist = new Discord.MessageEmbed() - .setTitle("User Not Found!") - .setDescription(`${supportbot.UserNotFound}\n\nTry Again:\`${supportbot.Prefix}${supportbot.AddUser} \``) - .setColor(supportbot.ErrorColour) - - if (!rUser) return message.channel.send({ embed: UserNotExist }); - - message.channel.updateOverwrite(rUser, { - VIEW_CHANNEL: true, - CREATE_INVITE: false, - SEND_MESSAGES: true, - READ_MESSAGES: true - }); - - const Complete = new Discord.MessageEmbed() - .setTitle("User Added!") - .setDescription(supportbot.AddedUser.replace(/%user%/g, rUser.id)) - .setTimestamp() - .setColor(supportbot.EmbedColour) - message.channel.send({ embed: Complete }); } }; diff --git a/commands/announce.js b/commands/announce.js index 50205ce..fff1a6e 100644 --- a/commands/announce.js +++ b/commands/announce.js @@ -23,14 +23,14 @@ module.exports = { if(!locateChannel) return message.channel.send({ embed: errornochannel }); - let serverAdmins = message.guild.roles.cache.find(adminRole => adminRole.name === supportbot.Admin); + let Admins = message.guild.roles.cache.find(adminRole => adminRole.name === supportbot.Admin); const NoPerms = new Discord.MessageEmbed() .setTitle("Invalid Permissions!") - .setDescription(`${supportbot.IncorrectPerms}\n\nRole Required: \`${serverAdmins.name}\``) + .setDescription(`${supportbot.IncorrectPerms}\n\nRole Required: \`${Admins.name}\``) .setColor(supportbot.WarningColour) - if (!message.member.roles.cache.has(serverAdmins.id)) + if (!message.member.roles.cache.has(Admins.id)) return message.channel.send({ embed: NoPerms }); diff --git a/commands/help.js b/commands/help.js index b833464..e7568fa 100644 --- a/commands/help.js +++ b/commands/help.js @@ -40,13 +40,7 @@ module.exports = { .setColor(supportbot.EmbedColour) .setFooter(supportbot.EmbedFooter, message.author.displayAvatarURL()); - if (message.member.roles.cache.some(role => role.name === supportbot.Staff, supportbot.Admin)) { - HelpCommandEmbed.addFields( - { name: '🔑 Staff Commands', value: `${staffCommands}\n`, inline: false }, - ) - } - - if (message.member.roles.cache.some(role => role.name === supportbot.Staff)) { + if (message.member.roles.cache.some(role => role.name === supportbot.Staff || supportbot.Admin)) { HelpCommandEmbed.addFields( { name: '🔑 Staff Commands', value: `${staffCommands}\n`, inline: false }, ) diff --git a/commands/helptest.js b/commands/helptest.js new file mode 100644 index 0000000..aa46695 --- /dev/null +++ b/commands/helptest.js @@ -0,0 +1,33 @@ +// SupportBot 6.0, Created by Emerald Services +// Links Command + +const Discord = require("discord.js"); +const fs = require("fs"); + +const yaml = require('js-yaml'); +const { execute } = require("./help"); +const supportbot = yaml.load(fs.readFileSync('./supportbot-config.yml', 'utf8')); + +module.exports = { + name: supportbot.LinksCommand, + description: supportbot.LinksDesc, + + execute(message, args) { + + const LinksEmbed = new Discord.MessageEmbed() + .setColor(supportbot.EmbedColour) + + let botLinks = supportbot.HELP; + + let links = ''; + + for ( let name in botLinks ) { + links += `[${name}](${botLinks[ name ]})\n`; + }; + + LinksEmbed.addField(supportbot.HelpTitle, links) + + message.channel.send({ embed: LinksEmbed }); + + } +}; \ No newline at end of file diff --git a/commands/removeUser.js b/commands/removeUser.js index 47b02ca..4d260d9 100644 --- a/commands/removeUser.js +++ b/commands/removeUser.js @@ -19,42 +19,44 @@ module.exports = { const NoPerms = new Discord.MessageEmbed() .setTitle("Invalid Permissions!") - .setDescription(`${supportbot.IncorrectPerms}\n\nRole Required: \`${supportbot.Staff}\``) + .setDescription(`${supportbot.IncorrectPerms}\n\nRole Required: \`${supportbot.Staff}\` or \`${supportbot.Admin}\``) .setColor(supportbot.WarningColour) - if (!message.member.roles.cache.has(SupportStaff.id)) + if (!message.member.roles.cache.has(SupportStaff.id || Admins.id)) { + if (!message.channel.name.startsWith( `${supportbot.TicketChannel}-` )) { + const Exists = new Discord.MessageEmbed() + .setTitle("No Ticket Found!") + .setDescription(`${supportbot.NoValidTicket}`) + .setColor(supportbot.WarningColour); + message.channel.send({ embed: Exists }); + + return; + } + + let rUser = message.guild.member(message.mentions.users.first() || message.guild.members.cache.get(args[0])); + const UserNotExist = new Discord.MessageEmbed() + .setTitle("User Not Found!") + .setDescription(`${supportbot.UserNotFound}\n\nTry Again:\`${supportbot.Prefix}${supportbot.RemoveUser} \``) + .setColor(supportbot.ErrorColour) + + if (!rUser) return message.channel.send({ embed: UserNotExist }); + + message.channel.updateOverwrite(rUser, { + VIEW_CHANNEL: false, + CREATE_INVITE: false, + SEND_MESSAGES: false, + READ_MESSAGES: false + }); + + const Complete = new Discord.MessageEmbed() + .setTitle("User Removed!") + .setDescription(supportbot.RemovedUser.replace(/%user%/g, rUser.id)) + .setTimestamp() + .setColor(supportbot.EmbedColour) + message.channel.send({ embed: Complete }); + } else { return message.channel.send({ embed: NoPerms }); + } - if (!message.channel.name.startsWith( `${supportbot.TicketChannel}-` )) { - const Exists = new Discord.MessageEmbed() - .setTitle("No Ticket Found!") - .setDescription(`${supportbot.NoValidTicket}`) - .setColor(supportbot.WarningColour); - message.channel.send({ embed: Exists }); - - return; - } - - let rUser = message.guild.member(message.mentions.users.first() || message.guild.members.cache.get(args[0])); - const UserNotExist = new Discord.MessageEmbed() - .setTitle("User Not Found!") - .setDescription(`${supportbot.UserNotFound}\n\nTry Again:\`${supportbot.Prefix}${supportbot.RemoveUser} \``) - .setColor(supportbot.ErrorColor) - - if (!rUser) return message.channel.send({ embed: UserNotExist }); - - message.channel.updateOverwrite(rUser, { - VIEW_CHANNEL: false, - CREATE_INVITE: false, - SEND_MESSAGES: false, - READ_MESSAGES: false - }); - - const Complete = new Discord.MessageEmbed() - .setTitle("User Removed!") - .setDescription(supportbot.RemovedUser.replace(/%user%/g, rUser.id)) - .setTimestamp() - .setColor(supportbot.EmbedColour) - message.channel.send({ embed: Complete }); } }; diff --git a/storage/SupportTickets.json b/storage/SupportTickets.json index 7635a24..63b9e40 100644 --- a/storage/SupportTickets.json +++ b/storage/SupportTickets.json @@ -1,4 +1,4 @@ { - "ticket": "ticket-0061", + "ticket": "ticket-0062", "id":419821884431925260 } \ No newline at end of file diff --git a/storage/TicketID.json b/storage/TicketID.json index 0ece568..6a8227a 100644 --- a/storage/TicketID.json +++ b/storage/TicketID.json @@ -1,5 +1,5 @@ { "716992597377286145": { - "id": 62 + "id": 63 } } \ No newline at end of file