From 4e492c95ea6e1d1b44cf8434f2a0215f78d04c9c Mon Sep 17 00:00:00 2001
From: Unknown <jtsshieh@outlook.com>
Date: Sat, 24 Feb 2018 14:02:03 -0500
Subject: Auto stash before merge of "master" and "origin/master"

---
 commands/8ball.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/commands/8ball.js b/commands/8ball.js
index db0b8d3..f188270 100644
--- a/commands/8ball.js
+++ b/commands/8ball.js
@@ -2,6 +2,14 @@ exports.run = async (bot, msg, args) => {
   if (args.length < 1) return msg.reply('You need to ask the 8-ball something for it to respond!');
 
   const responses = [
+    'May the odds ever be in your favor...',
+    'Definetely not! Did you ever think that this would work?',
+    'Most definetely',
+    'Seems probable..',
+    'Sure, why not?',
+    'No!',
+    'Probably.',
+    'If a sentience can do a backflip, then this can happen!',
     'It is certain',
     'It is decidedly so',
     'Without a doubt',
-- 
cgit v1.2.3


From 0af8a767a247212453a56baa29b51337b0d9b626 Mon Sep 17 00:00:00 2001
From: Unknown <jtsshieh@outlook.com>
Date: Sat, 24 Feb 2018 14:05:39 -0500
Subject: fixed\s

---
 commands/ban.js     | 2 +-
 commands/kick.js    | 2 +-
 commands/purge.js   | 2 +-
 commands/say.js     | 1 +
 commands/softban.js | 2 +-
 commands/warn.js    | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/commands/ban.js b/commands/ban.js
index 74d8447..902b4fd 100644
--- a/commands/ban.js
+++ b/commands/ban.js
@@ -36,6 +36,6 @@ exports.conf = {
 exports.help = {
   name: 'ban',
   description: 'Ban a user from this server.',
-  usage: '@<user> <...reason>',
+  usage: '@user <...reason>',
   category: 'Moderation',
 };
diff --git a/commands/kick.js b/commands/kick.js
index c371c21..b015d01 100644
--- a/commands/kick.js
+++ b/commands/kick.js
@@ -19,6 +19,6 @@ exports.conf = {
 exports.help = {
   name: 'kick',
   description: 'Kick a user out of the server.',
-  usage: '@<user> <...reason>',
+  usage: '@user <...reason>',
   category: 'Moderation',
 };
diff --git a/commands/purge.js b/commands/purge.js
index a0e9541..f02cb0a 100644
--- a/commands/purge.js
+++ b/commands/purge.js
@@ -26,6 +26,6 @@ exports.conf = {
 exports.help = {
   name: 'purge',
   description: 'Get rid of messages quickly.',
-  usage: '@(user) <messages>',
+  usage: '@user <messages>',
   category:'Moderation',
 };
diff --git a/commands/say.js b/commands/say.js
index 9d7c156..1d57a06 100644
--- a/commands/say.js
+++ b/commands/say.js
@@ -16,5 +16,6 @@ exports.conf = {
 exports.help = {
   name: 'say',
   description: 'Control on what the bot says.',
+  usage: '<...text>',
   category: 'Owners Only',
 };
diff --git a/commands/softban.js b/commands/softban.js
index 8c4fee0..3044090 100644
--- a/commands/softban.js
+++ b/commands/softban.js
@@ -36,6 +36,6 @@ exports.conf = {
 exports.help = {
   name: 'softban',
   description: 'Kick the user and delete their messages.',
-  usage: '@<user> <...reason>',
+  usage: '@user <...reason>',
   category: 'Moderation',
 };
diff --git a/commands/warn.js b/commands/warn.js
index a20cf08..88305a0 100644
--- a/commands/warn.js
+++ b/commands/warn.js
@@ -28,6 +28,6 @@ exports.conf = {
 exports.help = {
   name: 'warn',
   description: 'Logs a warning to the user.',
-  usage : '@<user> <reason>',
+  usage : '@user <reason>',
   category: 'Moderation',
 };
-- 
cgit v1.2.3