2.2.0

matsyui · Aug 20, 2021 · 76a4e3f · 76a4e3f
1 parent e9d5b85
commit 76a4e3f
Show file tree

Hide file tree

Showing 26 changed files with 351 additions and 2,326 deletions.
diff --git a/.env b/.env
@@ -0,0 +1,4 @@
+TOKEN= {Your Discord Token}
+TOPGG= {Your TOPGG Token}
+DLS= {Your DLS Token}
+OWNERID=221838936866029568
diff --git a/.env-sample b/.env-sample
@@ -1,3 +1,4 @@
-TOKEN=PutYourTokenHere
-OWNERID=221838936866029568
-
+TOKEN= {Your Discord Token}
+TOPGG= {Your TOPGG Token}
+DLS= {Your DLS Token}
+OWNERID=221838936866029568
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 lerna-debug.log*
+.vscode
 
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
@@ -70,7 +71,7 @@ typings/
 .yarn-integrity
 
 # dotenv environment variables file
-.env
+#.env
 .env.test
 
 # parcel-bundler cache (https://parceljs.org/)
@@ -110,6 +111,6 @@ node_modules/
 
 data/
 json.sqlite
-
+package-lock.json
 
 
diff --git a/Procfile b/Procfile
@@ -1 +1 @@
-worker: node shard.js
+worker: npm start
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
   <a href="https://discord.com/api/oauth2/authorize?client_id=814580247973986314&permissions=8&scope=bot%20applications.commands"><img src="https://i.imgur.com/s4q1Wz3.png" width="15%"/></a>
   <h1><a href="https://discord.com/api/oauth2/authorize?client_id=814580247973986314&permissions=8&scope=bot%20applications.commands">Prune Bot </a></h1>
 
-  <h3>Version 2.1.0</h3>
+  <h3>Version 2.2.0</h3>
 
   <h4>Created by Mashwishi | Powered by <a href="https://discord.js.org/">Discord.js</a></h4>
 

diff --git a/commands/custom/fetch.js b/commands/custom/fetch.js
@@ -1,7 +1,7 @@
 const Discord = require("discord.js");
 const config = require("../../config/config.json");
 
-module.exports.run = async (client, message, args) => {
+module.exports.run = async (client, message, args) => {   	   
 
     //User no permission
 	const embed6 = new Discord.MessageEmbed()
@@ -19,7 +19,7 @@ module.exports.run = async (client, message, args) => {
     .setColor("RED");
 	if (!message.guild.member(client.user).hasPermission("ADMINISTRATOR")) {
 		return message.channel.send(notice3).then(m => m.delete({ timeout: 5000 }));
-	}
+	}    
 
     //Process
     const ListEmbedP = new Discord.MessageEmbed() 
@@ -61,16 +61,15 @@ module.exports.run = async (client, message, args) => {
     //Fetching data (new)
     try
     {
-        await message.guild.members.fetch()
-        .then(console.log)
+        await message.guild.members.fetch();
+        //.then(console.log)
     }
     catch (error)
     {
         console.error(error);
         return listMsg.edit(ListEmbedF);     
     }
-    return listMsg.edit(ListEmbedS);
-
+    return listMsg.edit(ListEmbedS);       
 };
 module.exports.help = {
 	name: "fetch",

diff --git a/commands/custom/knorole.js b/commands/custom/knorole.js
@@ -1,7 +1,7 @@
 const Discord = require("discord.js");
 const config = require("../../config/config.json");
 
-module.exports.run = async (client, message, args) => {
+module.exports.run = async (client, message, args) => {    
 
     //User no permission
 	const embed6 = new Discord.MessageEmbed()

diff --git a/commands/custom/krole.js b/commands/custom/krole.js
@@ -2,7 +2,6 @@ const Discord = require("discord.js");
 const config = require("../../config/config.json");
 
 module.exports.run = async (client, message, args) => {
-
     //User no permission
 	const embed6 = new Discord.MessageEmbed()
 		.setDescription(

diff --git a/commands/custom/prune.js b/commands/custom/prune.js
@@ -0,0 +1,59 @@
+const Discord = require("discord.js");
+const config = require("../../config/config.json");
+
+module.exports.run = async (client, message, args) => {	
+
+    //User no permission
+	const embed6 = new Discord.MessageEmbed()
+		.setDescription(
+			`${emojis.cross} ${message.author.username}, Missing Permission`
+		)
+		.setColor("RED");
+	if (!message.member.hasPermission("KICK_MEMBERS") || message.author.id === 221838936866029568) {
+		return message.channel.send(embed6).then(m => m.delete({ timeout: 5000 }));
+	}
+
+    //Bot no permission
+    const notice3 = new Discord.MessageEmbed()
+    .setDescription(`${emojis.cross} I don't have permission to list people!`)
+    .setColor("RED");
+	if (!message.guild.member(client.user).hasPermission("KICK_MEMBERS")) {
+		return message.channel.send(notice3).then(m => m.delete({ timeout: 5000 }));
+	}
+
+    //List and Pruning
+    let mentionedrole = message.mentions.roles.firstKey()
+    const withoutPrefix = message.content.slice(config.prefix.length);
+    const split = withoutPrefix.split(/ +/);
+    const command = split[0];
+    const argss = split.slice(1);
+    let id = argss[0];
+
+    //Didn't mention a role
+	const notice2 = new Discord.MessageEmbed()
+		.setDescription(`${message.author}, You didn't mention a role!`)
+		.setColor("RED");
+	if (!args.length) return message.channel.send(notice2);
+
+    //Didn't mention the exact role
+	const embed7 = new Discord.MessageEmbed()
+		.setTitle("Wrong Usage!")
+		.setDescription("Correct Example: p!prune <role> <days>")
+		.setColor("RED");
+	if (!id.startsWith('<@&') && id.endsWith('>')) {
+		message.delete();
+		return message.channel.send(embed7).then(m => m.delete({ timeout: 5000 }));
+	}
+
+
+
+
+};
+module.exports.help = {
+	name: "prune",
+	description: "Pruning users in specific roles and days.",
+	usage: "p!prune <role> <days>",
+	accessableby: "ADMINISTRATOR",
+	aliases: [],
+	cooldown: 300
+};
diff --git a/commands/custom/setprefix.js b/commands/custom/setprefix.js
@@ -3,6 +3,7 @@ const fs = require("fs");
 const settings = require("../../config/settings.json");
 
 module.exports.run = async (client, message, args) => {
+
 	const embedmissingperms = new Discord.MessageEmbed()
 		.setDescription(
 			`${emojis.cross} ${message.author.username}, Missing Permission!`
@@ -15,7 +16,7 @@ module.exports.run = async (client, message, args) => {
 
 	const embedtoolong = new Discord.MessageEmbed()
 		.setDescription(
-			`${emojis.cross} Prefix's length shouldn't be longer than 3 letters`
+			`${emojis.cross} Prefix's length shouldn't be longer than 5 letters`
 		)
 		.setColor("RED");
 	const embedsame = new Discord.MessageEmbed()
@@ -29,7 +30,7 @@ module.exports.run = async (client, message, args) => {
 
 	if (!args[0]) return message.channel.send(embedmissing);
 
-	if (args[0].length > 3) return message.channel.send(embedtoolong);
+	if (args[0].length > 5) return message.channel.send(embedtoolong);
 	if (args[0] == client.settings.get(message.guild.id, "prefix"))
 		return message.channel.send(embedsame);
 

diff --git a/commands/custom/unorole.js b/commands/custom/unorole.js
@@ -1,7 +1,7 @@
 const Discord = require("discord.js");
 const config = require("../../config/config.json");
 
-module.exports.run = async (client, message, args) => {
+module.exports.run = async (client, message, args) => {      
 
     //User no permission
 	const embed6 = new Discord.MessageEmbed()

diff --git a/commands/custom/urole.js b/commands/custom/urole.js
@@ -1,7 +1,7 @@
 const Discord = require("discord.js");
 const config = require("../../config/config.json");
 
-module.exports.run = async (client, message, args) => {
+module.exports.run = async (client, message, args) => {    
 
     //User no permission
 	const embed6 = new Discord.MessageEmbed()

diff --git a/commands/info/help.js b/commands/info/help.js
@@ -14,7 +14,7 @@ module.exports.run = async (client, message, args) => {
 			.setDescription(
 				`**My prefix:** \`${prefixesdatabase.prefix}\` , Slash Commands list for \`/help\`\nClick [HERE](https://discord.com/api/oauth2/authorize?client_id=${client.user.id}&permissions=8&scope=bot%20applications.commands) to invite me to your server.`
 			)
-			.addField("**:gear: Basic**", "`help`, `ping`, `vote`, `uptime`, `setprefix`")
+			.addField("**:gear: Basic**", "`help`, `ping`, `vote`, `votes`,`uptime`, `setprefix`")
 			.addField(
 				"**🛠️ Moderation**",
 				"`ban`, `clear`, `clearwarn`, `createchannel`, `createemoji`, `kick`, `lockchannel`, `mute`, `rename`, `slowmode`, `unban`, `unlockchannel`, `unmute`, `warn`, `warnings`"
@@ -29,7 +29,7 @@ module.exports.run = async (client, message, args) => {
 			)			
 			.addField(
 				"**:tada: Giveaways**",
-				"`start-giveaway`, `reroll`, `end-giveaway`"
+				"`gstart`, `greroll`, `gend`"
 			)
 			.addField(
 				"**:frame_photo: Images**",
@@ -42,9 +42,6 @@ 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 },

diff --git a/commands/info/invite.js b/commands/info/invite.js
@@ -23,12 +23,12 @@ module.exports.run = async (client, message, args) => {
 		.addFields(
 			{ 
 				name: 'Prune Bot [Blue]', 
-				value: '[Invite Me](https://discord.com/api/oauth2/authorize?client_id=815785457672650802&permissions=8&scope=bot%20applications.commands)\n**Prefix:** pbb!\n**Ram:** 2GB\n**CPU:** INTEL XEON', 
+				value: '[Invite Me](https://discord.com/api/oauth2/authorize?client_id=815785457672650802&permissions=8&scope=bot%20applications.commands)\n**Prefix:** pbb!\n**Ram:** 16GB\n**CPU:** INTEL XEON', 
 				inline: true 
 			},
 			{ 
 				name: 'Prune Bot [Green]', 
-				value: '[Invite Me](https://discord.com/api/oauth2/authorize?client_id=869637540896989234&permissions=8&scope=bot%20applications.commands)\n**Prefix:** pbg!\n**Ram:** 1GB\n**CPU:** INTEL XEON', 
+				value: '[Invite Me](https://discord.com/api/oauth2/authorize?client_id=869637540896989234&permissions=8&scope=bot%20applications.commands)\n**Prefix:** pbg!\n**Ram:** 16GB\n**CPU:** INTEL XEON', 
 				inline: true 
 			}               
 		)		
@@ -47,9 +47,6 @@ module.exports.run = async (client, message, args) => {
 		.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 }
-		)	
-		.addFields(
-			{ name: 'Powered by DarkHost', value: '[Host your Discord Bot 24/7 For Free](https://discord.gg/EnXm6GaWa3)'}   
 		)									                                                                                          		  	
 		.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');    

diff --git a/commands/info/packages.js b/commands/info/packages.js
@@ -8,15 +8,12 @@ module.exports.run = async (client, message, args) => {
 
     const embed = new Discord.MessageEmbed()
 			.setColor("#6633CC")
-			.setDescription(`[Repository](https://discord.gg/j3Mx7cHgXF) **|** [Bugs](https://discord.gg/j3Mx7cHgXF) **|** [License](https://github.com/mashwishi/PruneBot/blob/master/LICENSE)`)
+			.setDescription(`[Repository](https://github.com/mashwishi/PruneBot) **|** [Bugs](https://github.com/mashwishi/PruneBot/issues) **|** [License](https://github.com/mashwishi/PruneBot/blob/master/LICENSE)`)
 			.addFields(
 				{ name: 'Node Engine', value: `Version: [${package.engines.node}](https://nodejs.org)`, inline: true },  
                 { name: 'Information', value: `[Read Me](${package.homepage})`, inline: true }, 
                 { name: 'Author', value: `[${package.author}](https://github.com/mashwishi)`, inline: true }
-			)	            
-			.addFields(
-				{ name: 'Powered by DarkHost', value: '[Host your Discord Bot 24/7 For Free](https://discord.gg/EnXm6GaWa3)'}   
-			)							
+			)	            						
             .addFields(
 				{ name: '@discordjs/opus', value: 'Version: ^0.5.3', inline: true },
 				{ name: 'canvacord', value: 'Version: ^5.2.1', inline: true },                

diff --git a/commands/info/ping.js b/commands/info/ping.js
@@ -6,8 +6,6 @@ module.exports.run = async (client, message, args) => {
 		`Message Latency: **${
 			Date.now() - message.createdTimestamp
 		}ms**\nDiscord API Latency: **${Math.round(client.ws.ping)}ms**`
-	).addFields(
-		{ name: 'Powered by DarkHost', value: '[Host your Discord Bot 24/7 For Free](https://discord.gg/EnXm6GaWa3)'}   
 	);
 	message.channel.send(bbb);
 };

diff --git a/commands/info/roleinfo.js b/commands/info/roleinfo.js
@@ -25,6 +25,8 @@ module.exports.run = async (client, message, args) => {
 		true: "Yes"
 	};
 
+
+
 	const roleemebed = new Discord.MessageEmbed()
 		.setTitle(`Role Information: ${gRole.name}`)
 		.setColor("#000000")

diff --git a/commands/info/stats.js b/commands/info/stats.js
@@ -34,10 +34,7 @@ module.exports.run = async (client, message) => {
 					"Uptime",
 					`${days}d ${hours}h ${minutes}m ${seconds}.${milliseconds}s`,
 					true
-				)
-				.addFields(
-					{ name: 'Powered by DarkHost', value: '[Host your Discord Bot 24/7 For Free](https://discord.gg/EnXm6GaWa3)'}   
-				)					
+				)				
 				.setFooter(
 					"PruneBot 2021",
 					"https://cdn.Mashwishi.tk/file/MashwishiCDN/79654c28218d88a8cfefe9c01f6d338c.png"

diff --git a/commands/info/uptime.js b/commands/info/uptime.js
@@ -62,10 +62,7 @@ module.exports.run = async (client, message, args) => {
 					)
 					.addField("Uptime Percentage", `${numberas}%`)
 					//	.addField("Now Time", nowtime)
-					//	.addField('Bootup Time', derweSA);;
-					.addFields(
-						{ name: 'Powered by DarkHost', value: '[Host your Discord Bot 24/7 For Free](https://discord.gg/EnXm6GaWa3)'}   
-					)						
+					//	.addField('Bootup Time', derweSA);;						
 					.setFooter(`Last Launched at ${derweSA}`);
 
 				message.edit(serverembedss);