diff --git a/commands/close.js b/commands/close.js index 2a5f340..006cc29 100644 --- a/commands/close.js +++ b/commands/close.js @@ -12,7 +12,14 @@ module.exports = { name: "bob", execute(message, args) { + console.log(`\u001b[32m`, `[${supportbot.Bot_Name}]:`, `\u001b[32m`, `${message.author.tag} has executed ${supportbot.Prefix}${supportbot.CloseTicket}!`); - message.channel.delete() + if (supportbot.Close === "staff") { + member.roles.cache.has(``) + } + + if (supportbot.Close === "user") { + + } } }; \ No newline at end of file diff --git a/events/guildMemberAdd.js b/events/guildMemberAdd.js index 5142ef3..e4ffa83 100644 --- a/events/guildMemberAdd.js +++ b/events/guildMemberAdd.js @@ -23,11 +23,11 @@ module.exports = async (bot, member) => { .setDescription(supportbot.WelcomeMessage.replace(/%member%/g, member.user.username).replace(/%guildname%/g, member.guild.name)) .setColor(supportbot.EmbedColour) - if (supportbot.WelcomeMessage_Icon === "BOT") { + if (supportbot.SystemMessage_Icon === "BOT") { GuildAddMember.setThumbnail(bot.user.displayAvatarURL()) } - if (supportbot.WelcomeMessage_Icon === "USER") { + if (supportbot.SystemMessage_Icon === "USER") { GuildAddMember.setThumbnail(member.user.displayAvatarURL()) } diff --git a/events/guildMemberRemove.js b/events/guildMemberRemove.js new file mode 100644 index 0000000..168a4e6 --- /dev/null +++ b/events/guildMemberRemove.js @@ -0,0 +1,48 @@ +// SupportBot 6.0, Created by Emerald Services +// Ready Event + +const Discord = require("discord.js"); +const fs = require("fs"); + +const yaml = require('js-yaml'); +const supportbot = yaml.load(fs.readFileSync('./supportbot-config.yml', 'utf8')); + +module.exports = async (bot, member) => { + + if (supportbot.SystemMessages === "true") { + const SystemChannel = member.guild.channels.cache.find(channel => channel.name === supportbot.SystemMessage_Channel) + + if (!SystemChannel) return; + + console.log(`[${supportbot.Bot_Name}]: ${member.user.username} has left ${member.guild.name}!`) + + if (supportbot.SystemMessage_Type === "embed") { + const GuildRemoveMember = new Discord.MessageEmbed() + .setTitle(supportbot.Leave_Title) + .setDescription(supportbot.LeaveMessage.replace(/%member%/g, member.user.username).replace(/%guildname%/g, member.guild.name)) + .setColor(supportbot.EmbedColour) + + if (supportbot.SystemMessage_Icon === "BOT") { + GuildAddMember.setThumbnail(bot.user.displayAvatarURL()) + } + + if (supportbot.SystemMessage_Icon === "USER") { + GuildAddMember.setThumbnail(member.user.displayAvatarURL()) + } + + + if (supportbot.SystemMessage_EmbedFooter === "true") { + GuildAddMember.setFooter(supportbot.EmbedFooter) + } + + SystemChannel.send({ embed: GuildRemoveMember }); + + } + + if (supportbot.SystemMessage_Type === "normal") { + SystemChannel.send(supportbot.LeaveMessage.replace(/%member%/g, member.user.username).replace(/%guildname%/g, member.guild.name)) + + } + + } +}; diff --git a/package-lock.json b/package-lock.json index 2fd0c32..7540c76 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,8 @@ { - "requires": true, + "name": "supportbot", + "version": "6.0.0", "lockfileVersion": 1, + "requires": true, "dependencies": { "@discordjs/collection": { "version": "0.1.5", diff --git a/storage/SupportTickets.json b/storage/SupportTickets.json index 65ce4ab..3078a8d 100644 --- a/storage/SupportTickets.json +++ b/storage/SupportTickets.json @@ -1,4 +1,4 @@ { - "ticket": "ticket-0050", - "id":419821884431925260 + "ticket": "ticket-0054", + "id":276497792526974996 } \ No newline at end of file diff --git a/storage/TicketID.json b/storage/TicketID.json index 1e0e5d4..1e4e615 100644 --- a/storage/TicketID.json +++ b/storage/TicketID.json @@ -1,5 +1,5 @@ { "716992597377286145": { - "id": 51 + "id": 55 } } \ No newline at end of file diff --git a/supportbot-config.yml b/supportbot-config.yml index 80b6a8d..17ef23d 100644 --- a/supportbot-config.yml +++ b/supportbot-config.yml @@ -83,11 +83,12 @@ SystemMessages: "true" SystemMessage_Channel: "system-messages" SystemMessage_Type: "embed" # There are 2 types of how you can send system messages, 'normal' or 'embed' +SystemMessage_Icon: "USER" -Welcome_Title: "Welcome" +Welcome_Title: "User Joined!" WelcomeMessage: "Hello %member%, Welcome to %guildname%!" -WelcomeMessage_Icon: "USER" +Leave_Title: "User Left!" LeaveMessage: "Goodbye %member%, Thank you for visting %guildname%!" SystemMessage_EmbedFooter: "false"