From 46e51e237e2e59582652d63f10f5c2df5856fea7 Mon Sep 17 00:00:00 2001 From: loicbersier Date: Sat, 9 Nov 2019 14:17:29 +0100 Subject: [PATCH] Revert the right version and add perm check --- commands/fun/ytp.js | 139 +++++++++++++++++++++++++++----------------- 1 file changed, 85 insertions(+), 54 deletions(-) diff --git a/commands/fun/ytp.js b/commands/fun/ytp.js index 477b438c..e724eb4a 100644 --- a/commands/fun/ytp.js +++ b/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 \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) => { - files.forEach(file => { - if (file.endsWith('.mp4')) { - asset.push(`./asset/ytp/userVid/${file}`); - } - }); - - let options = { - 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/', - sounds: './asset/ytp/sounds/', - music: './asset/ytp/music/', - resources: './asset/ytp/resources/', - temp: os.tmpdir(), - sourceList: asset, - outro: './asset/ytp/outro.mp4', // Need an outro or it won't work - OUTPUT_FILE: `${os.tmpdir()}/${message.id}_YTP.mp4`, - MAX_CLIPS: 20, - transitions: true, - effects: { - effect_RandomSound: true, - effect_RandomSoundMute: true, - effect_Reverse: true, - effect_Chorus: true, - effect_Vibrato: true, - effect_HighPitch: true, - effect_LowPitch: true, - effect_SpeedUp: true, - effect_SlowDown: true, - effect_Dance: true, - effect_Squidward: false - } - }; - - new YTPGenerator().configurateAndGo(options) - .then(() => { - loadingmsg.delete(); - return message.reply('Here is your YTP!', {files: [`${os.tmpdir()}/${message.id}_YTP.mp4`]}) - .catch(() => { - return message.channel.send('Whoops, look like the vid might be too big for discord, my bad, please try again'); - }); - }) - .catch(() => { - loadingmsg.delete(); - return message.reply('Oh no! An error has occured!'); - }); + let files = fs.readdirSync('./asset/ytp/userVid/'); + // Count number of total vid + files.forEach(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 loadingmsg = await message.channel.send(`Processing, this can take a **long** time, i'll ping you when i finished \nSome info: There is currently ${mp4.length} videos, you can add yours by doing \`\`${prefix[0]}ytp --add (link or attachment)\`\``); + + + let options = { + debug: false, // Better set this to false to avoid flood in console + MAX_STREAM_DURATION: Math.floor((Math.random() * 3) + 1), // Random duration of video clip + sources: './asset/ytp/sources/', + sounds: './asset/ytp/sounds/', + music: './asset/ytp/music/', + resources: './asset/ytp/resources/', + temp: os.tmpdir(), + sourceList: asset, + outro: './asset/ytp/outro.mp4', // Need an outro or it won't work + OUTPUT_FILE: `${os.tmpdir()}/${message.id}_YTP.mp4`, + MAX_CLIPS: MAX_CLIPS, + transitions: true, + effects: { + effect_RandomSound: true, + effect_RandomSoundMute: true, + effect_Reverse: true, + effect_Chorus: true, + effect_Vibrato: true, + effect_HighPitch: true, + effect_LowPitch: true, + effect_SpeedUp: true, + effect_SlowDown: true, + effect_Dance: true, + effect_Squidward: false // Not yet implemented + } + }; + + new YTPGenerator().configurateAndGo(options) + .then(() => { + loadingmsg.delete(); + return message.reply('Here is your YTP!', {files: [`${os.tmpdir()}/${message.id}_YTP.mp4`]}) + .catch(() => { + return message.channel.send('Whoops, look like the vid might be too big for discord, my bad, please try again'); + }); + }) + .catch(err => { + console.error(err); + loadingmsg.delete(); + return message.reply('Oh no! An error has occured!'); + }); } }