From 8d824ae8b51f85e1b6b7fe9f0b6dcf0a2b00b23f Mon Sep 17 00:00:00 2001 From: pokesudenk Date: Sun, 25 Feb 2018 00:31:51 -0500 Subject: new, kinda long story --- commands/Fun/story.js | 1 + 1 file changed, 1 insertion(+) diff --git a/commands/Fun/story.js b/commands/Fun/story.js index 56e4dac..1f1a442 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'); -- cgit v1.2.3 From 5c2843435f589d2962135052e9f8be6f18830291 Mon Sep 17 00:00:00 2001 From: pokesudenk Date: Sun, 25 Feb 2018 00:34:31 -0500 Subject: added some aliases --- commands/Fun/8ball.js | 2 +- commands/Fun/cureboredom.js | 2 +- commands/Fun/story.js | 2 +- commands/Owners Only/eval.js | 2 +- 4 files changed, 4 insertions(+), 4 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..0445a5a 100644 --- a/commands/Fun/cureboredom.js +++ b/commands/Fun/cureboredom.js @@ -18,7 +18,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 1f1a442..dc2a674 100644 --- a/commands/Fun/story.js +++ b/commands/Fun/story.js @@ -24,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, }; -- cgit v1.2.3 From 3122617fb4230202dad1b4e521e6b0d54ea9865f Mon Sep 17 00:00:00 2001 From: pokesudenk Date: Sun, 25 Feb 2018 00:48:48 -0500 Subject: new uptime args + new cures for boredom --- commands/Fun/cureboredom.js | 8 ++++++++ commands/Utility/uptime.js | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/commands/Fun/cureboredom.js b/commands/Fun/cureboredom.js index 0445a5a..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')); diff --git a/commands/Utility/uptime.js b/commands/Utility/uptime.js index 63bd6a4..1d8529c 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 === 'ms') return msg.channel.send(bot.uptime + ' ms.'); + if (args === 's') return msg.channel.send(uptimeSeconds); + if (args === 'min') return msg.channel.send(uptime / 60 + ':' + uptimeSeconds) msg.channel.send(':clock3: Pokebot has been up for ' + hours + ' hours, ' + uptimeMinutes + ' minutes, and ' + uptimeSeconds + ' seconds.'); }; -- cgit v1.2.3 From 71deacc33391b223606a272ddec1e614528a22f9 Mon Sep 17 00:00:00 2001 From: pokesudenk Date: Sun, 25 Feb 2018 00:49:59 -0500 Subject: forgot ARRAYS gamers --- commands/Utility/uptime.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/commands/Utility/uptime.js b/commands/Utility/uptime.js index 1d8529c..ffe38e0 100644 --- a/commands/Utility/uptime.js +++ b/commands/Utility/uptime.js @@ -9,9 +9,9 @@ exports.run = (bot, msg, args) => { uptimeMinutes = uptimeMinutes - 60; } const uptimeSeconds = minutes % 60; - if (args === 'ms') return msg.channel.send(bot.uptime + ' ms.'); - if (args === 's') return msg.channel.send(uptimeSeconds); - if (args === 'min') return msg.channel.send(uptime / 60 + ':' + uptimeSeconds) + if (args[0] === 'ms') return msg.channel.send(bot.uptime + ' ms.'); + if (args[0] === 's') return msg.channel.send(uptimeSeconds); + if (args[0] === 'min') return msg.channel.send(uptime / 60 + ':' + uptimeSeconds); msg.channel.send(':clock3: Pokebot has been up for ' + hours + ' hours, ' + uptimeMinutes + ' minutes, and ' + uptimeSeconds + ' seconds.'); }; -- cgit v1.2.3 From cadcaa95bc1311fb8f29e3538f62e61cc732b2e6 Mon Sep 17 00:00:00 2001 From: pokesudenk Date: Sun, 25 Feb 2018 00:51:10 -0500 Subject: might wanna f l o o r that --- commands/Utility/uptime.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/Utility/uptime.js b/commands/Utility/uptime.js index ffe38e0..c15cf66 100644 --- a/commands/Utility/uptime.js +++ b/commands/Utility/uptime.js @@ -11,7 +11,7 @@ exports.run = (bot, msg, args) => { const uptimeSeconds = minutes % 60; if (args[0] === 'ms') return msg.channel.send(bot.uptime + ' ms.'); if (args[0] === 's') return msg.channel.send(uptimeSeconds); - if (args[0] === 'min') return msg.channel.send(uptime / 60 + ':' + uptimeSeconds); + if (args[0] === 'min') return msg.channel.send(Math.floor(uptime / 60) + ':' + uptimeSeconds); msg.channel.send(':clock3: Pokebot has been up for ' + hours + ' hours, ' + uptimeMinutes + ' minutes, and ' + uptimeSeconds + ' seconds.'); }; -- cgit v1.2.3 From abc2868a2d65df654b071a447c1a4eba77e76b2c Mon Sep 17 00:00:00 2001 From: pokesudenk Date: Sun, 25 Feb 2018 00:52:38 -0500 Subject: better formatting --- commands/Utility/uptime.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/commands/Utility/uptime.js b/commands/Utility/uptime.js index c15cf66..bc9b1fa 100644 --- a/commands/Utility/uptime.js +++ b/commands/Utility/uptime.js @@ -10,8 +10,8 @@ exports.run = (bot, msg, args) => { } const uptimeSeconds = minutes % 60; if (args[0] === 'ms') return msg.channel.send(bot.uptime + ' ms.'); - if (args[0] === 's') return msg.channel.send(uptimeSeconds); - if (args[0] === 'min') return msg.channel.send(Math.floor(uptime / 60) + ':' + uptimeSeconds); + 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.'); }; -- cgit v1.2.3 From 815230a264de36f692a5754ccd00054ff48347d9 Mon Sep 17 00:00:00 2001 From: Alee Date: Sun, 25 Feb 2018 11:01:19 -0500 Subject: Added a issue template --- .github/ISSUE_TEMPLATE.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000..506aa5f --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,7 @@ +# Below is an example issue. This is what YOU should write in an issue. + +Feature requests: Please add x to the bot. It should return x when ran. + +Bug reports: Tell about the bug. Show screenshots and use precise details so the developers know exactly what you are talking about. + +After reading this you must replace this text with the error you got. \ No newline at end of file -- cgit v1.2.3