From 6d283a78fb355a4c5f39f2778b8c9d300fad35a1 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 1 Sep 2017 21:07:28 -0400 Subject: Updates on console --- aleebot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aleebot.js b/aleebot.js index 45c9be3..0a3fbce 100644 --- a/aleebot.js +++ b/aleebot.js @@ -54,7 +54,7 @@ fs.readdir('./commands/', (err, files) => { client.on('ready', () => { - log("[>] AleeBot is now ready! Running version " + abversion + "!"); + log(`[>] AleeBot is now ready! Running version ${abversion} in ${client.guilds.size} guilds!`); client.user.setPresence({ game: { name: 'with version ' + abversion + '', -- cgit v1.2.3 From c7efbbf003f56184b762f96912f98f15e4c47948 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 3 Sep 2017 09:41:32 -0400 Subject: Changes and added new stuff! --- .gitignore | 2 ++ aleeplayer.js | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++ aptokens.json.example | 6 ++++ gource.sh | 2 +- 4 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 aleeplayer.js create mode 100644 aptokens.json.example diff --git a/.gitignore b/.gitignore index c0783d7..6c89f41 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,5 @@ Temporary Items absettings\.json amtoken\.json + +aptokens\.json diff --git a/aleeplayer.js b/aleeplayer.js new file mode 100644 index 0000000..10ccfac --- /dev/null +++ b/aleeplayer.js @@ -0,0 +1,97 @@ +const { Client } = require('discord.js'); +const yt = require('ytdl-core'); +const tokens = require('./tokens.json'); +const client = new Client(); + +let queue = {}; + +const commands = { + 'play': (msg) => { + if (queue[msg.guild.id] === undefined) return msg.channel.sendMessage(`Add some songs to the queue first with ${tokens.prefix}add`); + if (!msg.guild.voiceConnection) return commands.join(msg).then(() => commands.play(msg)); + if (queue[msg.guild.id].playing) return msg.channel.sendMessage('Already Playing'); + let dispatcher; + queue[msg.guild.id].playing = true; + + console.log(queue); + (function play(song) { + console.log(song); + if (song === undefined) return msg.channel.sendMessage('Queue is empty').then(() => { + queue[msg.guild.id].playing = false; + msg.member.voiceChannel.leave(); + }); + msg.channel.sendMessage(`Playing: **${song.title}** as requested by: **${song.requester}**`); + dispatcher = msg.guild.voiceConnection.playStream(yt(song.url, { audioonly: true }), { passes : tokens.passes }); + let collector = msg.channel.createCollector(m => m); + collector.on('message', m => { + if (m.content.startsWith(tokens.prefix + 'pause')) { + msg.channel.sendMessage('paused').then(() => {dispatcher.pause();}); + } else if (m.content.startsWith(tokens.prefix + 'resume')){ + msg.channel.sendMessage('resumed').then(() => {dispatcher.resume();}); + } else if (m.content.startsWith(tokens.prefix + 'skip')){ + msg.channel.sendMessage('skipped').then(() => {dispatcher.end();}); + } else if (m.content.startsWith('volume+')){ + if (Math.round(dispatcher.volume*50) >= 100) return msg.channel.sendMessage(`Volume: ${Math.round(dispatcher.volume*50)}%`); + dispatcher.setVolume(Math.min((dispatcher.volume*50 + (2*(m.content.split('+').length-1)))/50,2)); + msg.channel.sendMessage(`Volume: ${Math.round(dispatcher.volume*50)}%`); + } else if (m.content.startsWith('volume-')){ + if (Math.round(dispatcher.volume*50) <= 0) return msg.channel.sendMessage(`Volume: ${Math.round(dispatcher.volume*50)}%`); + dispatcher.setVolume(Math.max((dispatcher.volume*50 - (2*(m.content.split('-').length-1)))/50,0)); + msg.channel.sendMessage(`Volume: ${Math.round(dispatcher.volume*50)}%`); + } else if (m.content.startsWith(tokens.prefix + 'time')){ + msg.channel.sendMessage(`time: ${Math.floor(dispatcher.time / 60000)}:${Math.floor((dispatcher.time % 60000)/1000) <10 ? '0'+Math.floor((dispatcher.time % 60000)/1000) : Math.floor((dispatcher.time % 60000)/1000)}`); + } + }); + dispatcher.on('end', () => { + collector.stop(); + play(queue[msg.guild.id].songs.shift()); + }); + dispatcher.on('error', (err) => { + return msg.channel.sendMessage('error: ' + err).then(() => { + collector.stop(); + play(queue[msg.guild.id].songs.shift()); + }); + }); + })(queue[msg.guild.id].songs.shift()); + }, + 'join': (msg) => { + return new Promise((resolve, reject) => { + const voiceChannel = msg.member.voiceChannel; + if (!voiceChannel || voiceChannel.type !== 'voice') return msg.reply('I couldn\'t connect to your voice channel...'); + voiceChannel.join().then(connection => resolve(connection)).catch(err => reject(err)); + }); + }, + 'add': (msg) => { + let url = msg.content.split(' ')[1]; + if (url == '' || url === undefined) return msg.channel.sendMessage(`You must add a YouTube video url, or id after ${tokens.prefix}add`); + yt.getInfo(url, (err, info) => { + if(err) return msg.channel.sendMessage('Invalid YouTube Link: ' + err); + if (!queue.hasOwnProperty(msg.guild.id)) queue[msg.guild.id] = {}, queue[msg.guild.id].playing = false, queue[msg.guild.id].songs = []; + queue[msg.guild.id].songs.push({url: url, title: info.title, requester: msg.author.username}); + msg.channel.sendMessage(`added **${info.title}** to the queue`); + }); + }, + 'queue': (msg) => { + if (queue[msg.guild.id] === undefined) return msg.channel.sendMessage(`Add some songs to the queue first with ${tokens.prefix}add`); + let tosend = []; + queue[msg.guild.id].songs.forEach((song, i) => { tosend.push(`${i+1}. ${song.title} - Requested by: ${song.requester}`);}); + msg.channel.sendMessage(`__**${msg.guild.name}'s Music Queue:**__ Currently **${tosend.length}** songs queued ${(tosend.length > 15 ? '*[Only next 15 shown]*' : '')}\n\`\`\`${tosend.slice(0,15).join('\n')}\`\`\``); + }, + 'help': (msg) => { + let tosend = ['```xl', tokens.prefix + 'join : "Join Voice channel of msg sender"', tokens.prefix + 'add : "Add a valid youtube link to the queue"', tokens.prefix + 'queue : "Shows the current queue, up to 15 songs shown."', tokens.prefix + 'play : "Play the music queue if already joined to a voice channel"', '', 'the following commands only function while the play command is running:'.toUpperCase(), tokens.prefix + 'pause : "pauses the music"', tokens.prefix + 'resume : "resumes the music"', tokens.prefix + 'skip : "skips the playing song"', tokens.prefix + 'time : "Shows the playtime of the song."', 'volume+(+++) : "increases volume by 2%/+"', 'volume-(---) : "decreases volume by 2%/-"', '```']; + msg.channel.sendMessage(tosend.join('\n')); + }, + 'reboot': (msg) => { + if (msg.author.id == tokens.adminID) process.exit(); //Requires a node module like Forever to work. + } +}; + +client.on('ready', () => { + console.log('ready!'); +}); + +client.on('message', msg => { + if (!msg.content.startsWith(tokens.prefix)) return; + if (commands.hasOwnProperty(msg.content.toLowerCase().slice(tokens.prefix.length).split(' ')[0])) commands[msg.content.toLowerCase().slice(tokens.prefix.length).split(' ')[0]](msg); +}); +client.login(tokens.d_token); diff --git a/aptokens.json.example b/aptokens.json.example new file mode 100644 index 0000000..d2b8c17 --- /dev/null +++ b/aptokens.json.example @@ -0,0 +1,6 @@ +{ + "d_token" : "YOUR DISCORD APP TOKEN", + "adminID" : "YOUR DISCORD USER ID", + "prefix" : "ap:", + "passes" : 1 //can be increased to reduce packetloss at the expense of upload bandwidth, 4-5 should be lossless at the expense of 4-5x upload +} diff --git a/gource.sh b/gource.sh index 6a21f69..47d1eb7 100644 --- a/gource.sh +++ b/gource.sh @@ -1 +1 @@ -gource -f \ No newline at end of file +gource -f --key \ No newline at end of file -- cgit v1.2.3 From 2a1d4d0a7618acf84698eb1e3dce8590bf659227 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 3 Sep 2017 22:08:06 -0400 Subject: Packages updated --- package-lock.json | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index e1998c9..f8a50d6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,23 +1,51 @@ { "name": "aleebot", - "version": "1.0.6", + "version": "1.1.0", "lockfileVersion": 1, + "requires": true, "dependencies": { + "blessed": { + "version": "0.1.81", + "resolved": "https://registry.npmjs.org/blessed/-/blessed-0.1.81.tgz", + "integrity": "sha1-+WLWh+wsNpVwrnGvhDJW5tDKESk=" + }, "discord.js": { "version": "11.1.0", "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-11.1.0.tgz", - "integrity": "sha1-U1HVnjeY9TbeGXXpLK5NEa89kmY=" + "integrity": "sha1-U1HVnjeY9TbeGXXpLK5NEa89kmY=", + "requires": { + "long": "3.2.0", + "prism-media": "0.0.1", + "snekfetch": "3.2.4", + "tweetnacl": "0.14.5", + "ws": "2.3.1" + } + }, + "fs": { + "version": "0.0.1-security", + "resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz", + "integrity": "sha1-invTcYa23d84E/I4WLV+yq9eQdQ=" }, "long": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz", "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=" }, + "moment": { + "version": "2.18.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz", + "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=" + }, "prism-media": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-0.0.1.tgz", "integrity": "sha1-o0JcnKvVDRxsAuVDlBoRiVZnvRA=" }, + "profanities": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/profanities/-/profanities-2.5.0.tgz", + "integrity": "sha1-O1OuFKnSoYYPBR+C/kyPRtHVHRU=" + }, "safe-buffer": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz", @@ -41,7 +69,11 @@ "ws": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/ws/-/ws-2.3.1.tgz", - "integrity": "sha1-a5Sz5EfLajY/eF6vlK9jWejoHIA=" + "integrity": "sha1-a5Sz5EfLajY/eF6vlK9jWejoHIA=", + "requires": { + "safe-buffer": "5.0.1", + "ultron": "1.1.0" + } } } } -- cgit v1.2.3 From de3c80eccc8d09bc63c3694afdeba40795dd6539 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 8 Sep 2017 16:11:06 -0400 Subject: Updates on if the person types the wrong command --- aleebot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aleebot.js b/aleebot.js index 0a3fbce..da7a719 100644 --- a/aleebot.js +++ b/aleebot.js @@ -100,7 +100,7 @@ client.on("message", function(message) { let commandFile = require(`./commands/${command}.js`); commandFile.run(client, message, args, config, abversion); } catch (err) { - message.channel.send(":no_entry_sign: Error!\n`"+ err +"`"); + message.channel.send(`:no_entry_sign: Error!\n The command ${command} isn't found!`); log(err); } -- cgit v1.2.3