Merge branch 'master' of https://github.com/mashwishi/PruneBot

Author: matsyui

Procfile

@@ -0,0 +1 @@
+worker: node shard.js

commands/custom/setprefix.js

@@ -81,7 +81,7 @@ module.exports.run = async (client, message, args) => {
 module.exports.help = {
 	name: "setprefix",
 	description: "This command is used for changing the prefix.",
-	usage: "p!setprefix <value>",
+	usage: "p!setprefix <prefix>",
 	accessableby: "Manage Server",
 	aliases: [],
 	cooldown: 10

commands/emmessage.js

@@ -1,7 +1,6 @@
 const Discord = require("discord.js");
 
 module.exports.run = async (client, message, args) => {
-
 	const settings = require("../../config/settings.json");
 	const prefixesdatabase = client.settings.ensure(message.guild.id, settings);
 
@@ -42,13 +41,11 @@ module.exports.run = async (client, message, args) => {
 			.addField(
 				"**:partying_face: Fun**",
 				"`8ball`, `cat`, `deaes256`, `kiss`, `meme`, `ngif`, `pat`, `poke`, `smug`, `thigh`, `tickle`"
-			)	
-			.addFields(
-				{ name: 'Powered by DarkHost', value: '[Host your Discord Bot 24/7 For Free](https://discord.gg/EnXm6GaWa3)'}   
-			)							
+			)			
             .addFields(
-				{ name: ':desktop: Github Project', value: '[Download Code](https://github.com/mashwishi/PruneBot)', inline: true },
-				{ name: ':revolving_hearts: Support Project', value: '[Donate](https://ko-fi.com/mashwishi)', inline: true },)				  	
+				{ name: ':desktop: Github (Source Code)', value: 'https://github.com/mashwishi/PruneBot' },
+				{ name: ':revolving_hearts: Support the Developer:', value: 'https://ko-fi.com/mashwishi' }   
+			  )			
 			.setTitle('Prune Bot | Commands')
 			.setFooter(`©${nowyear} ${client.user.username} Created by Mashwishi.\nCommand requested by: ${message.author.username}#${message.author.discriminator}`, `https://i.imgur.com/ypxq7B9.png`)
 			.setThumbnail('https://i.imgur.com/ypxq7B9.png')    
@@ -78,10 +75,7 @@ module.exports.run = async (client, message, args) => {
 						command.help.usage || "No Usage"
 					}\`\`\`\n**Permissions:**\n\`\`\`${
 						command.help.accessableby || "Members"
-					}\`\`\`\n**Cooldown (in seconds):**\n\`\`\`${
-						command.help.cooldown || "No Cooldown"
 					}\`\`\`\n**Aliases:**\n\`\`\`${alia}\`\`\``
-					
 				)
 				.setColor("#4a4b4d")
 				.setFooter(
@@ -104,7 +98,6 @@ module.exports.help = {
 	description: "This command is used for displaying all commands.",
 	usage: "p!help",
 	accessableby: "Members",
-	aliases: ['?', 'commands', 'command'],
-	cooldown: 3
+	aliases: [],
+	cooldown: 120
 };
-

commands/info/help.js

@@ -1,10 +1,7 @@
 const Discord = require("discord.js");
 const settings = require("../../config/settings.json");
 
-//const cooldowns = new Discord.Collection();
-
-//create cooldowns map
-const cooldowns = new Map();
+const cooldowns = new Discord.Collection();
 
 module.exports = async (client, message) => {
 	if (message.author.bot) return;
@@ -21,47 +18,44 @@ module.exports = async (client, message) => {
 	}
 
 	if (!message.content.startsWith(prefixesdatabase.prefix)) return;
-
-	let commandText = message.content.split(" ")[0].slice(prefixesdatabase.prefix.length);
-	if (!client.commands.has(commandText)) {
-		commandText = client.aliases.get(commandText);
-		if (!commandText) return;
-	}
-	
-	const command = client.commands.get(commandText);
+	const command = message.content
+		.split(" ")[0]
+		.slice(prefixesdatabase.prefix.length);
 	const args = message.content.split(" ").slice(1);
-	
-	if (!cooldowns.has(command.help.name)) {
-		cooldowns.set(command.help.name, new Discord.Collection());
+	if (!cooldowns.has(command.name)) {
+		cooldowns.set(command.name, new Discord.Collection());
 	}
-	
 	const now = Date.now();
-	const timestamps = cooldowns.get(command.help.name);
-	const cooldownAmount = (command.help.cooldown || 2) * 1000;
-
+	const timestamps = cooldowns.get(command.name);
+	const cooldownAmount = (command.cooldown || 15) * 1000;
 	if (timestamps.has(message.author.id)) {
 		const expirationTime = timestamps.get(message.author.id) + cooldownAmount;
 		if (now < expirationTime) {
-			const timeLeft = (expirationTime - now) / 1000;
-			const timeLeftfinal = new Date(timeLeft * 1000).toISOString().substr(11, 8)
+			const timeLeft = (expirationTime - now) / 2000;
 			return message.reply(
 				`Before using **${
 					prefixesdatabase.prefix
-				}${commandText}**, please wait for **${timeLeftfinal}** second for cooldowns!`
-			).then(m => m.delete({ timeout: 5000 }));
+				}${command}**, please wait for **${timeLeft.toFixed(
+					1
+				)} second for cooldowns!**`
+			);
 		}
 	}
-	
 	timestamps.set(message.author.id, now);
 	setTimeout(() => timestamps.delete(message.author.id), cooldownAmount);
-	
+	let cmd;
+	if (client.commands.has(command)) {
+		cmd = client.commands.get(command);
+	} else if (client.aliases.has(command)) {
+		cmd = client.commands.get(client.aliases.get(command));
+	}
 	try {
-		command.run(client, message, args);
+		cmd.run(client, message, args);
 	} catch (e) {
-		return console.log(`Invalid command: ${commandText}`);
+		return console.log(`Invalid command: ${command}`);
 	} finally {
 		console.log(
-			`${message.author.username} using command ${prefixesdatabase.prefix}${commandText}`
+			`${message.author.username} using command ${prefixesdatabase.prefix}${command}`
 		);
 	}
 };

events/client/message.js

@@ -1,6 +1,6 @@
 {
 	"name": "PruneBot",
-	"version": "2.1.0",
+	"version": "1.0.0",
 	"main": "shard.js",
 	"description": "A free open source solution to your server and user managing problems, built from scratch with code organization and quality in mind. Our goal is to cover as many functionalities as possible.",
 	"author": "Mashwishi",