Merge remote-tracking branch 'origin/master'

5 files changed, 17 insertions, 5 deletions

diff --git a/commands/Fun/8ball.js b/commands/Fun/8ball.js
index 3ebd1c3..7432c63 100644
--- a/commands/Fun/8ball.js
+++ b/commands/Fun/8ball.js
@@ -36,7 +36,7 @@ exports.run = async (bot, msg, args) => {
 };
 
 exports.conf = {
-  aliases: [],
+  aliases: ['ask'],
   guildOnly: true,
 };
 
diff --git a/commands/Fun/cureboredom.js b/commands/Fun/cureboredom.js
index c2e8304..9c38784 100644
--- a/commands/Fun/cureboredom.js
+++ b/commands/Fun/cureboredom.js
@@ -10,6 +10,14 @@ exports.run = (bot, msg, args) => {
     'Finding Bugs :bug:',
     'Being with Ayana :couple:',
     'Playing OS dressup :womans_clothes:',
+    'Chatting with friends :speech_balloon:',
+    'Livestreaming :satellite:',
+    'Programming a Discord Bot :man_dancing:',
+    'Listening to Anders Enger Jensen :musical_note:',
+    'Messing with Rich Presence :gear:',
+    'Making videos :movie_camera:',
+    'Taking pictures :camera:',
+    'Suggesting things for the server :dancers:',
   ];
 
   if (args[0] === 'list') return msg.channel.send(ideas.join('\n'));
@@ -18,7 +26,7 @@ exports.run = (bot, msg, args) => {
 };
 
 exports.conf = {
-  aliases: [],
+  aliases: ['cboredom'],
   guildOnly: true,
 };
 
diff --git a/commands/Fun/story.js b/commands/Fun/story.js
index 56e4dac..dc2a674 100644
--- a/commands/Fun/story.js
+++ b/commands/Fun/story.js
@@ -10,6 +10,7 @@ exports.run = async (bot, msg) => {
     [
       `${selectedUser1.username} bought ${selectedUser2.username} his favorite video game. This game is called "Pokemon". Then, they became best friends.`,
       `${selectedUser1.username} wants to become a Pokemon trainer, but he needs to get a Pokemon first!`,
+      `One day, ${selectedUser1.username} decided to go to a shop. He took his motorbike. Once he arrived at the shop, he went inside. He headed right, towards the chips. He grabbed a packet, and headed to check-out. He bumped into ${selectedUser2.username} at the counter, and decided to say hi. They had a little chat, and then decided to gossip about ${selectedUser3.username}. Then, as they were saying some horrible things about ${selectedUser3.username}, they unexpectedly showed up! Then, ${selectedUser1.username} and ${selectedUser2.username} got into a fight against ${selectedUser3.username}.\n\nKids, this is why you don't start drama.\nNow ${selectedUser1.username}, ${selectedUser2.username}, and ${selectedUser3.username} are no longer friends.`
     ];
     const storySelected = [Math.floor(Math.random() * stories.length)];
     const { RichEmbed } = require('discord.js');
@@ -23,7 +24,7 @@ exports.run = async (bot, msg) => {
 };
 
 exports.conf = {
-  aliases: [],
+  aliases: ['storytime'],
   guildOnly: true,
 };
 
diff --git a/commands/Owners Only/eval.js b/commands/Owners Only/eval.js
index 062635f..8024f15 100644
--- a/commands/Owners Only/eval.js
+++ b/commands/Owners Only/eval.js
@@ -55,7 +55,7 @@ exports.run = async (bot, msg, args) => {
 };
 
 exports.conf = {
-  aliases: [],
+  aliases: ['exec'],
   guildOnly: false,
 };
 
diff --git a/commands/Utility/uptime.js b/commands/Utility/uptime.js
index 63bd6a4..bc9b1fa 100644
--- a/commands/Utility/uptime.js
+++ b/commands/Utility/uptime.js
@@ -1,4 +1,4 @@
-exports.run = (bot, msg) => {
+exports.run = (bot, msg, args) => {
   let uptime = parseInt(bot.uptime);
   uptime = Math.floor(uptime / 1000);
   let uptimeMinutes = Math.floor(uptime / 60);
@@ -9,6 +9,9 @@ exports.run = (bot, msg) => {
     uptimeMinutes = uptimeMinutes - 60;
   }
   const uptimeSeconds = minutes % 60;
+  if (args[0] === 'ms') return msg.channel.send(bot.uptime + ' ms.');
+  if (args[0] === 's') return msg.channel.send(uptimeSeconds + ' seconds.');
+  if (args[0] === 'min') return msg.channel.send(Math.floor(uptime / 60) + ' minutes ' + uptimeSeconds + ' seconds.');
   msg.channel.send(':clock3: Pokebot has been up for ' + hours + ' hours, ' + uptimeMinutes + ' minutes, and ' + uptimeSeconds + ' seconds.');
 
 };