diff options
| author | 8cy <[email protected]> | 2020-04-10 11:43:19 -0700 |
|---|---|---|
| committer | 8cy <[email protected]> | 2020-04-10 11:43:19 -0700 |
| commit | 1134df0330ce4a8f2e9af97a638a5ffeac83be17 (patch) | |
| tree | 25d150ad5e68bd975b570f63645bac3aca05a014 | |
| parent | set default vol to 10%, 2.0.1 (diff) | |
| download | s5nical-1134df0330ce4a8f2e9af97a638a5ffeac83be17.tar.xz s5nical-1134df0330ce4a8f2e9af97a638a5ffeac83be17.zip | |
cool update :D, v2.0.2
- fix queue
- random emojis behind confirm messages :D
| -rw-r--r-- | commands/fun/quote.js | 7 | ||||
| -rw-r--r-- | commands/utility/clear.js | 3 | ||||
| -rw-r--r-- | commands/utility/membercount.js | 3 | ||||
| -rw-r--r-- | commands/utility/reboot.js | 7 | ||||
| -rw-r--r-- | commands/utility/uptime.js | 3 | ||||
| -rw-r--r-- | commands/voice/fart.js | 17 | ||||
| -rw-r--r-- | commands/voice/itemshop.js | 3 | ||||
| -rw-r--r-- | commands/voice/join.js | 3 | ||||
| -rw-r--r-- | commands/voice/leave.js | 1 | ||||
| -rw-r--r-- | commands/voice/loop.js | 3 | ||||
| -rw-r--r-- | commands/voice/pause.js | 1 | ||||
| -rw-r--r-- | commands/voice/play.js | 3 | ||||
| -rw-r--r-- | commands/voice/psycho.js | 1 | ||||
| -rw-r--r-- | commands/voice/queue.js | 6 | ||||
| -rw-r--r-- | commands/voice/remove.js | 3 | ||||
| -rw-r--r-- | commands/voice/resume.js | 1 | ||||
| -rw-r--r-- | commands/voice/shuffle.js | 3 | ||||
| -rw-r--r-- | commands/voice/skip.js | 1 | ||||
| -rw-r--r-- | commands/voice/skipall.js | 1 | ||||
| -rw-r--r-- | commands/voice/skipto.js | 1 | ||||
| -rw-r--r-- | commands/voice/squeak.js | 1 | ||||
| -rw-r--r-- | commands/voice/uhhhh.js | 1 | ||||
| -rw-r--r-- | commands/voice/volume.js | 3 | ||||
| -rw-r--r-- | commands/voice/wahoo.js | 1 |
24 files changed, 51 insertions, 26 deletions
diff --git a/commands/fun/quote.js b/commands/fun/quote.js index 2496ef3..cde9e90 100644 --- a/commands/fun/quote.js +++ b/commands/fun/quote.js @@ -1,5 +1,6 @@ const atquotes = require('at-quotes'); const { Command } = require('discord.js-commando'); +const emoji = require('emoji-random'); module.exports = class QuoteFun extends Command { constructor(client) { @@ -19,11 +20,11 @@ module.exports = class QuoteFun extends Command { if (!args.length) { msg.reply(atquotes.getQuote()); } else if (args[0] == 'finn') { - msg.reply(atquotes.getFinnQuote()); + msg.reply(atquotes.getFinnQuote() + emoji.random()); } else if (args[0] == 'jake') { - msg.reply(atquotes.getJakeQuote()); + msg.reply(atquotes.getJakeQuote() + emoji.random()); } else if (args[0] == 'ice-king') { - msg.reply(atquotes.getIceKingQuote()); + msg.reply(atquotes.getIceKingQuote() + emoji.random()); } } };
\ No newline at end of file diff --git a/commands/utility/clear.js b/commands/utility/clear.js index 61f9fbb..204581f 100644 --- a/commands/utility/clear.js +++ b/commands/utility/clear.js @@ -1,4 +1,5 @@ const { Command } = require('discord.js-commando'); +const emoji = require('emoji-random'); module.exports = class ClearUtility extends Command { constructor(client) { @@ -51,7 +52,7 @@ module.exports = class ClearUtility extends Command { }).then(messages => { // I am on v11 discord.js msg.channel.bulkDelete(messages); }); - msg.reply('it\'s been deleted ~uwu').then(deleteNotificationMessage => { + msg.reply('it\'s been deleted ~uwu' + emoji.random()).then(deleteNotificationMessage => { deleteNotificationMessage.delete({ timeout: 1000 }); }); } diff --git a/commands/utility/membercount.js b/commands/utility/membercount.js index 4ec7978..9690296 100644 --- a/commands/utility/membercount.js +++ b/commands/utility/membercount.js @@ -1,4 +1,5 @@ const { Command } = require('discord.js-commando'); +const emoji = require('emoji-random'); module.exports = class MemberCountUtility extends Command { constructor(client) { @@ -16,6 +17,6 @@ module.exports = class MemberCountUtility extends Command { }); } run(msg) { - msg.reply(`there are **${msg.guild.memberCount}** members in **${msg.guild.name}**`); + msg.reply(`there are **${msg.guild.memberCount}** members in **${msg.guild.name}**` + emoji.random()); } };
\ No newline at end of file diff --git a/commands/utility/reboot.js b/commands/utility/reboot.js index 031ff08..931f0db 100644 --- a/commands/utility/reboot.js +++ b/commands/utility/reboot.js @@ -1,4 +1,5 @@ const { Command } = require('discord.js-commando'); +const emoji = require('emoji-random'); module.exports = class RebootUtility extends Command { constructor(client) { @@ -25,14 +26,14 @@ module.exports = class RebootUtility extends Command { } else if (!msg.guild.voice) { msg.member.voice.channel.join(); msg.member.voice.channel.leave(); - msg.reply('voice module reboot finished lol'); + msg.reply('voice module reboot finished lol' + emoji.random()); } else if (msg.guild.voice) { msg.member.voice.channel.leave(); msg.member.voice.channel.join(); - msg.reply('voice module reboot finished lol'); + msg.reply('voice module reboot finished lol' + emoji.random()); } } else if (module == 'commands' || module == 'commands' || module == 'cmds' || module == 'cmd' || module == 'c') { - msg.reply('commands module reboot finished lol'); + msg.reply('commands module reboot finished lol' + emoji.random()); } else if (!args.length) { msg.reply('no module(s) specified'); } diff --git a/commands/utility/uptime.js b/commands/utility/uptime.js index 1fe86e9..4643295 100644 --- a/commands/utility/uptime.js +++ b/commands/utility/uptime.js @@ -1,6 +1,7 @@ const { Command } = require('discord.js-commando'); const upTime = require('moment'); require('moment-duration-format'); +const emoji = require('emoji-random'); module.exports = class UptimeUtility extends Command { constructor(client) { @@ -19,6 +20,6 @@ module.exports = class UptimeUtility extends Command { } run(msg) { const duration = upTime.duration(this.client.uptime).format(" D [days], H [hrs], m [mins], s [secs]"); - msg.reply(duration); + msg.reply(duration + emoji.random()); } };
\ No newline at end of file diff --git a/commands/voice/fart.js b/commands/voice/fart.js index f5b1dfd..1a35732 100644 --- a/commands/voice/fart.js +++ b/commands/voice/fart.js @@ -1,4 +1,5 @@ const { Command } = require('discord.js-commando'); +const emoji = require('emoji-random'); module.exports = class FartVoice extends Command { constructor(client) { @@ -16,49 +17,49 @@ module.exports = class FartVoice extends Command { var fartNum = Math.floor((Math.random() * 8) + 1); if (fartNum == 1) { - msg.reply('you got fart 1, courtesy of Sin'); + msg.reply('you got fart 1, courtesy of Sin' + emoji.random()); const dispatcher = connection.play('./assets/audio/farts/1.mp3'); dispatcher.on('finish', () => { connection.disconnect(); }); } else if (fartNum == 2) { - msg.reply('you got fart 2, courtesy of Sin'); + msg.reply('you got fart 2, courtesy of Sin' + emoji.random()); const dispatcher = connection.play('./assets/audio/farts/2.mp3'); dispatcher.on('finish', () => { connection.disconnect(); }); } else if (fartNum == 3) { - msg.reply('you got fart 3, courtesy of Sin'); + msg.reply('you got fart 3, courtesy of Sin' + emoji.random()); const dispatcher = connection.play('./assets/audio/farts/3.mp3'); dispatcher.on('finish', () => { connection.disconnect(); }); } else if (fartNum == 4) { - msg.reply('you got fart 4, courtesy of Sin'); + msg.reply('you got fart 4, courtesy of Sin' + emoji.random()); const dispatcher = connection.play('./assets/audio/farts/4.mp3'); dispatcher.on('finish', () => { connection.disconnect(); }); } else if (fartNum == 5) { - msg.reply('you got fart 5, courtesy of Sin'); + msg.reply('you got fart 5, courtesy of Sin' + emoji.random()); const dispatcher = connection.play('./assets/audio/farts/5.mp3'); dispatcher.on('finish', () => { connection.disconnect(); }); } else if (fartNum == 6) { - msg.reply('you got fart 6, courtesy of nick'); + msg.reply('you got fart 6, courtesy of nick' + emoji.random()); const dispatcher = connection.play('./assets/audio/farts/6.mp3'); dispatcher.on('finish', () => { connection.disconnect(); }); } else if (fartNum == 7) { - msg.reply('you got fart 7, courtesy of nick'); + msg.reply('you got fart 7, courtesy of nick' + emoji.random()); const dispatcher = connection.play('./assets/audio/farts/7.mp3'); dispatcher.on('finish', () => { connection.disconnect(); }); } else if (fartNum == 8) { - msg.reply('you got fart 8, courtesy of nick'); + msg.reply('you got fart 8, courtesy of nick' + emoji.random()); const dispatcher = connection.play('./assets/audio/farts/8.mp3'); dispatcher.on('finish', () => { connection.disconnect(); diff --git a/commands/voice/itemshop.js b/commands/voice/itemshop.js index 6550604..3c91f2a 100644 --- a/commands/voice/itemshop.js +++ b/commands/voice/itemshop.js @@ -1,5 +1,6 @@ const ytdl = require('ytdl-core'); const { Command } = require('discord.js-commando'); +const emoji = require('emoji-random'); module.exports = class ItemShopVoice extends Command { constructor(client) { @@ -19,7 +20,7 @@ module.exports = class ItemShopVoice extends Command { filter: 'audioonly' }); const dispatcher = connection.play(stream); - msg.reply('USE CODE FROZEN IN THE FORTNITE ITEM SHOP!!!'); + msg.reply('USE CODE FROZEN IN THE FORTNITE ITEM SHOP!!!' + emoji.random()); function timeCheck() { if (dispatcher.streamTime >= 6000) { diff --git a/commands/voice/join.js b/commands/voice/join.js index 0445390..52528be 100644 --- a/commands/voice/join.js +++ b/commands/voice/join.js @@ -1,4 +1,5 @@ const { Command } = require('discord.js-commando'); +const emoji = require('emoji-random'); module.exports = class JoinVoice extends Command { constructor(client) { @@ -18,7 +19,7 @@ module.exports = class JoinVoice extends Command { run(msg) { if (!msg.guild.voice && msg.member.voice.channel) { msg.member.voice.channel.join(); - msg.reply('succesfully joined voice channel'); + msg.reply('succesfully joined voice channel' + emoji.random()); } else if (msg.guild.voice) { msg.reply('i\'m already in voice channel'); } else if (!msg.member.voice.channel) { diff --git a/commands/voice/leave.js b/commands/voice/leave.js index 13009eb..1621336 100644 --- a/commands/voice/leave.js +++ b/commands/voice/leave.js @@ -1,4 +1,5 @@ const { Command } = require('discord.js-commando'); +const emoji = require('emoji-random'); module.exports = class LeaveVoice extends Command { constructor(client) { diff --git a/commands/voice/loop.js b/commands/voice/loop.js index 64c586e..0dc50df 100644 --- a/commands/voice/loop.js +++ b/commands/voice/loop.js @@ -1,4 +1,5 @@ const { Command } = require('discord.js-commando'); +const emoji = require('emoji-random'); module.exports = class LoopVoice extends Command { constructor(client) { @@ -21,7 +22,7 @@ module.exports = class LoopVoice extends Command { return msg.reply('there isn\'t a song playing right now lol'); } msg.channel.send( - `${msg.guild.musicData.nowPlaying.title} added to queue` + `${msg.guild.musicData.nowPlaying.title} added to queue` + emoji.random() ); msg.guild.musicData.queue.unshift(msg.guild.musicData.nowPlaying); return; diff --git a/commands/voice/pause.js b/commands/voice/pause.js index 2d6630e..1dd5a17 100644 --- a/commands/voice/pause.js +++ b/commands/voice/pause.js @@ -1,4 +1,5 @@ const { Command } = require('discord.js-commando'); +const emoji = require('emoji-random'); module.exports = class PauseVoice extends Command { constructor(client) { diff --git a/commands/voice/play.js b/commands/voice/play.js index 5fb5c7a..4248a48 100644 --- a/commands/voice/play.js +++ b/commands/voice/play.js @@ -4,6 +4,7 @@ const { MessageEmbed } = require('discord.js'); const Youtube = require('simple-youtube-api'); const { youtubeAPI } = require('../../config.json'); const youtube = new Youtube('AIzaSyB9xJENORzZt-GmOGx4WsNCPgKSIxhJcds'); // AIzaSyB9xJENORzZt-GmOGx4WsNCPgKSIxhJcds +const emoji = require('emoji-random'); module.exports = class PlayVoice extends Command { constructor(client) { @@ -67,7 +68,7 @@ module.exports = class PlayVoice extends Command { return this.playSong(msg.guild.musicData.queue, msg); } else if (msg.guild.musicData.isPlaying == true) { return msg.say( - `playlist - :musical_note: ${playlist.title} :musical_note: has been added to queue` + `playlist - :musical_note: ${playlist.title} :musical_note: has been added to queue` + emoji.random() ); } } diff --git a/commands/voice/psycho.js b/commands/voice/psycho.js index 35ae025..9e84be0 100644 --- a/commands/voice/psycho.js +++ b/commands/voice/psycho.js @@ -1,5 +1,6 @@ const ytdl = require('ytdl-core'); const { Command } = require('discord.js-commando'); +const emoji = require('emoji-random'); module.exports = class PsychoVoice extends Command { constructor(client) { diff --git a/commands/voice/queue.js b/commands/voice/queue.js index 9d9d3f3..47cf34f 100644 --- a/commands/voice/queue.js +++ b/commands/voice/queue.js @@ -1,4 +1,6 @@ const { Command } = require('discord.js-commando'); +const { MessageEmbed } = require('discord.js'); +const emoji = require('emoji-random'); module.exports = class QueueVoice extends Command { constructor(client) { @@ -18,9 +20,9 @@ module.exports = class QueueVoice extends Command { msg.guild.musicData.queue.map(obj => { titleArray.push(obj.title); }); - var queueEmbed = new MessageEmbed() + let queueEmbed = new MessageEmbed() .setColor(0xF97DAE) - .setTitle('Music Queue'); + .setTitle('music queue' + emoji.random()); for (let i = 0; i < titleArray.length; i++) { queueEmbed.addField(`${i + 1}:`, `${titleArray[i]}`); } diff --git a/commands/voice/remove.js b/commands/voice/remove.js index 848721a..6020b2a 100644 --- a/commands/voice/remove.js +++ b/commands/voice/remove.js @@ -1,4 +1,5 @@ const { Command } = require('discord.js-commando'); +const emoji = require('emoji-random'); module.exports = class RemoveVoice extends Command { constructor(client) { @@ -33,6 +34,6 @@ module.exports = class RemoveVoice extends Command { } msg.guild.musicData.queue.splice(songNumber - 1, 1); - return msg.say(`removed song #${songNumber} from queue`); + return msg.say(`removed song #${songNumber} from queue` + emoji.random()); } };
\ No newline at end of file diff --git a/commands/voice/resume.js b/commands/voice/resume.js index 62124e3..ea88ba1 100644 --- a/commands/voice/resume.js +++ b/commands/voice/resume.js @@ -1,4 +1,5 @@ const { Command } = require('discord.js-commando'); +const emoji = require('emoji-random'); module.exports = class ResumeVoice extends Command { constructor(client) { diff --git a/commands/voice/shuffle.js b/commands/voice/shuffle.js index 158fa5c..5f14b6e 100644 --- a/commands/voice/shuffle.js +++ b/commands/voice/shuffle.js @@ -1,5 +1,6 @@ const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); +const emoji = require('emoji-random'); module.exports = class ShuffleVoice extends Command { constructor(client) { @@ -33,7 +34,7 @@ module.exports = class ShuffleVoice extends Command { }); var queueEmbed = new MessageEmbed() .setColor(0xF97DAE) - .setTitle('new music q'); + .setTitle('new music q' + emoji.random()); for (let i = 0; i < titleArray.length; i++) { queueEmbed.addField(`${i + 1}:`, `${titleArray[i]}`); } diff --git a/commands/voice/skip.js b/commands/voice/skip.js index c819a67..5c5611b 100644 --- a/commands/voice/skip.js +++ b/commands/voice/skip.js @@ -1,4 +1,5 @@ const { Command } = require('discord.js-commando'); +const emoji = require('emoji-random'); module.exports = class SkipVoice extends Command { constructor(client) { diff --git a/commands/voice/skipall.js b/commands/voice/skipall.js index bce9852..202845d 100644 --- a/commands/voice/skipall.js +++ b/commands/voice/skipall.js @@ -1,4 +1,5 @@ const { Command } = require('discord.js-commando'); +const emoji = require('emoji-random'); module.exports = class SkipAllVoice extends Command { constructor(client) { diff --git a/commands/voice/skipto.js b/commands/voice/skipto.js index 5c41e66..78bf5df 100644 --- a/commands/voice/skipto.js +++ b/commands/voice/skipto.js @@ -1,4 +1,5 @@ const { Command } = require('discord.js-commando'); +const emoji = require('emoji-random'); module.exports = class SkipToVoice extends Command { constructor(client) { diff --git a/commands/voice/squeak.js b/commands/voice/squeak.js index 3dbb355..e9b54ab 100644 --- a/commands/voice/squeak.js +++ b/commands/voice/squeak.js @@ -1,4 +1,5 @@ const { Command } = require('discord.js-commando'); +const emoji = require('emoji-random'); module.exports = class SqueakVoice extends Command { constructor(client) { diff --git a/commands/voice/uhhhh.js b/commands/voice/uhhhh.js index 0ea364d..a28480f 100644 --- a/commands/voice/uhhhh.js +++ b/commands/voice/uhhhh.js @@ -1,4 +1,5 @@ const { Command } = require('discord.js-commando'); +const emoji = require('emoji-random'); module.exports = class MoanVoice extends Command { constructor(client) { diff --git a/commands/voice/volume.js b/commands/voice/volume.js index e29486d..cdcd478 100644 --- a/commands/voice/volume.js +++ b/commands/voice/volume.js @@ -1,4 +1,5 @@ const { Command } = require('discord.js-commando'); +const emoji = require('emoji-random'); module.exports = class VolumeVoice extends Command { constructor(client) { @@ -33,6 +34,6 @@ module.exports = class VolumeVoice extends Command { const volume = wantedVol / 100; msg.guild.musicData.volume = volume; msg.guild.musicData.songDispatcher.setVolume(volume); - msg.reply(`volume is now: ${wantedVol}%`); + msg.reply(`volume is now: ${wantedVol}%` + emoji.random()); } };
\ No newline at end of file diff --git a/commands/voice/wahoo.js b/commands/voice/wahoo.js index d89dfe3..6a478c0 100644 --- a/commands/voice/wahoo.js +++ b/commands/voice/wahoo.js @@ -1,4 +1,5 @@ const { Command } = require('discord.js-commando'); +const emoji = require('emoji-random'); module.exports = class WahooVoice extends Command { constructor(client) { |