Revert the right version and add perm check

commands/fun/ytp.js

@@ -10,6 +10,7 @@ class ytpCommand extends Command {
 		super('ytp', {
 			aliases: ['ytp', 'ytpplus', 'ytp+'],
 			category: 'fun',
+			clientPermissions: ['ATTACH_FILES', 'SEND_MESSAGES'],
 			args: [
 				{
 					id: 'add',
@@ -40,8 +41,17 @@ class ytpCommand extends Command {
 	}
 
 	async exec(message, args) {
+		let MAX_CLIPS = 20;
+
 		if (args.pool) {
-			return message.channel.send(`here is currently ${fs.readdirSync('./asset/ytp/userVid/').length} videos, you can add yours by doing \`\`${prefix[0]}ytp --add (link or attachment)\`\``);
+			let mp4 = [];
+			fs.readdirSync('./asset/ytp/userVid/').forEach(file => {
+				if (file.endsWith('mp4')) {
+					mp4.push(file);
+				}
+			});
+
+			return message.channel.send(`There is currently ${mp4.length} videos, you can add yours by doing \`\`${prefix[0]}ytp --add (link or attachment)\`\``);
 		}
 
 		if (args.add) {
@@ -54,15 +64,21 @@ class ytpCommand extends Command {
 			}
 			
 			if (url) {
-				return youtubedl.exec(url, ['-o', `./asset/ytp/userVid/${message.id}.mp4`], {}, function(err) {
+				return youtubedl.exec(url, ['--format=mp4', '-o', `./asset/ytp/userVid/${message.id}.mp4`], {}, function(err) {
 					if (err) {
 						console.error(err);
 						loadingmsg.delete();
-						return message.channel.send('An error has occured, I can\'t download from the link you provided.');
+						return message.channel.send('An error has occured, I can\'t download from the link you provided. Is it an mp4?');
 					} else {
-						let length = fs.readdirSync('./asset/ytp/userVid/').length;
+						let mp4 = [];
+						fs.readdirSync('./asset/ytp/userVid/').forEach(file => {
+							if (file.endsWith('mp4')) {
+								mp4.push(file);
+							}
+						});
+
 						loadingmsg.delete();
-						return message.reply(`Video sucessfully added to the pool! There is now ${length} videos`);
+						return message.reply(`Video sucessfully added to the pool! There is now ${mp4.length} videos`);
 					}
 				});
 			} else {
@@ -71,59 +87,74 @@ class ytpCommand extends Command {
 			}
 		} 
 
+
 		if (!message.channel.nsfw && !args.force) return message.channel.send('Please execute this command in an NSFW channel ( Content might not be NSFW but since the video are user submitted better safe than sorry ) OR --force to make the command work outside of nsfw channel BE AWARE THAT IT WON\'T CHANGE THE FINAL RESULT SO NSFW CAN STILL HAPPEN');
-		let loadingmsg = await message.channel.send(`Processing, this can take a **long** time, i'll ping you when i finished <a:loadingmin:527579785212329984>\nSome info: There is currently ${fs.readdirSync('./asset/ytp/userVid/').length} videos, you can add yours by doing \`\`${prefix[0]}ytp --add (link or attachment)\`\``);
 
-		// Read userVid folder and only take .mp4
+		// Read userVid folder and select random vid and only take .mp4
+		let mp4 = [];
 		let asset = [];
-		fs.readdir('./asset/ytp/userVid/', (err, files) => {
+		let files = fs.readdirSync('./asset/ytp/userVid/');
-			files.forEach(file => {
+		// Count number of total vid
-				if (file.endsWith('.mp4')) {
+		files.forEach(file => {
-					asset.push(`./asset/ytp/userVid/${file}`);
+			if (file.endsWith('mp4')) {
+				mp4.push(file);
+			}
+		});
+		// Select random vid depending on the amount of MAX_CLIPS
+		for (let i = 0; i < MAX_CLIPS; i++) {
+			let random = Math.floor(Math.random() * files.length);
+			let vid = `./asset/ytp/userVid/${files[random]}`;
+			if (files[random].endsWith('mp4')) {
+				if (!asset.includes(vid)) {
+					asset.push(vid);
 				}
-			});
+			}
+		}
 
-			let options = {  
+		let loadingmsg = await message.channel.send(`Processing, this can take a **long** time, i'll ping you when i finished <a:loadingmin:527579785212329984>\nSome info: There is currently ${mp4.length} videos, you can add yours by doing \`\`${prefix[0]}ytp --add (link or attachment)\`\``);
-				debug: false, // Better set this to false to avoid flood in console
+
-				MIN_STREAM_DURATION: Math.floor((Math.random() * 2) + 1), // Random duration of video clip
+
-				sources: './asset/ytp/sources/',
+		let options = {  
-				sounds: './asset/ytp/sounds/',
+			debug: false, // Better set this to false to avoid flood in console
-				music: './asset/ytp/music/',
+			MAX_STREAM_DURATION: Math.floor((Math.random() * 3) + 1), // Random duration of video clip
-				resources: './asset/ytp/resources/',
+			sources: './asset/ytp/sources/',
-				temp: os.tmpdir(),
+			sounds: './asset/ytp/sounds/',
-				sourceList: asset,
+			music: './asset/ytp/music/',
-				outro: './asset/ytp/outro.mp4', // Need an outro or it won't work
+			resources: './asset/ytp/resources/',
-				OUTPUT_FILE: `${os.tmpdir()}/${message.id}_YTP.mp4`,
+			temp: os.tmpdir(),
-				MAX_CLIPS: 20,
+			sourceList: asset,
-				transitions: true,
+			outro: './asset/ytp/outro.mp4', // Need an outro or it won't work
-				effects: {  
+			OUTPUT_FILE: `${os.tmpdir()}/${message.id}_YTP.mp4`,
-					effect_RandomSound: true,
+			MAX_CLIPS: MAX_CLIPS,
-					effect_RandomSoundMute: true,
+			transitions: true,
-					effect_Reverse: true,
+			effects: {  
-					effect_Chorus: true,
+				effect_RandomSound: true,
-					effect_Vibrato: true,
+				effect_RandomSoundMute: true,
-					effect_HighPitch: true,
+				effect_Reverse: true,
-					effect_LowPitch: true,
+				effect_Chorus: true,
-					effect_SpeedUp: true,
+				effect_Vibrato: true,
-					effect_SlowDown: true,
+				effect_HighPitch: true,
-					effect_Dance: true,
+				effect_LowPitch: true,
-					effect_Squidward: false
+				effect_SpeedUp: true,
-				}
+				effect_SlowDown: true,
-			};
+				effect_Dance: true,
+				effect_Squidward: false // Not yet implemented
+			}
+		};
 	
-			new YTPGenerator().configurateAndGo(options)
+		new YTPGenerator().configurateAndGo(options)
-				.then(() => {
+			.then(() => {
-					loadingmsg.delete();
+				loadingmsg.delete();
-					return message.reply('Here is your YTP!', {files: [`${os.tmpdir()}/${message.id}_YTP.mp4`]})
+				return message.reply('Here is your YTP!', {files: [`${os.tmpdir()}/${message.id}_YTP.mp4`]})
-						.catch(() => {
+					.catch(() => {
-							return message.channel.send('Whoops, look like the vid might be too big for discord, my bad, please try again');
+						return message.channel.send('Whoops, look like the vid might be too big for discord, my bad, please try again');
-						});
+					});
-				})
+			})
-				.catch(() => {
+			.catch(err => {
-					loadingmsg.delete();
+				console.error(err);
-					return message.reply('Oh no! An error has occured!');
+				loadingmsg.delete();
-				});
+				return message.reply('Oh no! An error has occured!');
-		});
+			});
 	}
 }