Merge remote-tracking branch 'origin/master'

README.md

@@ -1,8 +1,8 @@
-<h1 align="center">SupportBot v4.0.0</h1>
+<h1 align="center">SupportBot v4.0.1</h1>
 <h4 align="center">A Self Hosted discord application</h4>
 
 <p align="center">
-  <a href="https://discord.gg/hmWgxdF">
+    <a href="https://discord.gg/hmWgxdF">
     <img src="https://discordapp.com/api/guilds/516345301985132552/widget.png?style=shield" alt="Discord Server">
   </a>
   <img src="https://img.shields.io/badge/Made%20with-NodeJS-blue.svg" alt="Made with NodeJS">
@@ -61,7 +61,7 @@ Once you have setup your discord application such as invited the bot and added y
     "category": "Tickets",
     "Ticket_Message": "Your support ticket has been opened successfully\nPlease allow us some time to reach out to you.",
     "Ticket_Logs": "ticket-logs",
-    "bot.settings.Default_Ticket_Reason": "No Subject",
+    "Default_Ticket_Reason": "No Subject",
     "Ticket_React_Message": ":mailbox: React to create your support ticket.",
     
     "Commands_Log_Title": "SupportBot Logs",
@@ -127,3 +127,9 @@ Once you have setup your discord application such as invited the bot and added y
 
 # Donators List
 
+# Community
+<p align="center">
+    <a href="https://discord.gg/hmWgxdF">
+    <img src="https://discordapp.com/api/guilds/516345301985132552/widget.png?style=banner1" alt="Discord Server">
+  </a>
+</p>

commands/announce.js

@@ -31,8 +31,9 @@ exports.run = async(bot, message, args) => {
     let ac = message.guild.channels.find(AnnounceChannel => AnnounceChannel.name === `${bot.settings.Announcement_Channel}`)
     if(!ac) return message.channel.send(`:x: Error! Could not find the logs channel **${bot.settings.Announcement_Channel}**`)
 
-    ac.send(embed)
- //   ac.send("@everyone")
+    ac.send("@everyone").then((msg) => {
+        ac.send(embed);
+    });
 
     const SuggestionSuccessEmbed = new Discord.RichEmbed()
         .setDescription(`:white_check_mark: You have successfully created an announcement. <#${ac.id}>`)

commands/ticket.js

@@ -48,11 +48,16 @@ exports.run = (bot, message, args) => {
     }).then(TicketChannel => {
         
     // Roles
+<<<<<<< HEAD
         let staff = message.guild.roles.find(supportRole => supportRole.name === `${bot.settings.staff}`)
         let everyone = message.guild.roles.find(everyoneRole => everyoneRole.name === "@everyone")
         let department = message.guild.roles.find(DepartmentRole => DepartmentRole.name === `${bot.settings.Department_Role_1}`)
         let department2 = message.guild.roles.find(DepartmentRole => DepartmentRole.name === `${bot.settings.Department_Role_2}`)
         let department3 = message.guild.roles.find(DepartmentRole => DepartmentRole.name === `${bot.settings.Department_Role_3}`)
+=======
+        let support = message.guild.roles.find(supportRole => supportRole.name === `${bot.settings.support}`)
+        let everyone = message.guild.roles.find(everyoneRole => everyoneRole.name === "@everyone")
+>>>>>>> master
 
     // Permissions
         TicketChannel.overwritePermissions(everyone, { SEND_MESSAGES: false, READ_MESSAGES: false })