The Return, v8.2.0

- add goodbye
- add avatar alias to pfp
- add rule34, gelbooru and danbooru
- fix ban and kick
- add advice
- add motivation alias to motivate

2 files changed, 44 insertions, 14 deletions

diff --git a/dist/commands/moderation/ban.js b/dist/commands/moderation/ban.js
index fb0d42e..bee0d56 100644
--- a/dist/commands/moderation/ban.js
+++ b/dist/commands/moderation/ban.js
@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const discord_js_commando_1 = require("discord.js-commando");
+const emoji_random_1 = __importDefault(require("emoji-random"));
 module.exports = class BanModeration extends discord_js_commando_1.Command {
     constructor(client) {
         super(client, {
@@ -11,26 +15,39 @@ module.exports = class BanModeration extends discord_js_commando_1.Command {
             description: 'Ban someone.',
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY', 'BAN_MEMBERS'],
             clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY', 'BAN_MEMBERS'],
-            examples: ['uwu!ban @sin#1337'],
-            guildOnly: true,
+            examples: [
+                'uwu!ban @sin#1337',
+                'uwu!banuser @sin#1337',
+                'uwu!ban-user @sin#1337'
+            ],
             throttling: {
                 usages: 5,
                 duration: 30
             },
+            guildOnly: true
         });
     }
     run(msg) {
-        var _a;
-        let userID = (_a = msg.mentions.members) === null || _a === void 0 ? void 0 : _a.first().id;
-        if (!msg.guild.member(userID)) {
+        var _a, _b;
+        let userID = (_a = msg.mentions.members) === null || _a === void 0 ? void 0 : _a.first();
+        if (!(userID === null || userID === void 0 ? void 0 : userID.id)) {
+            msg.reply('No member was mentioned. ' + emoji_random_1.default.random());
+        }
+        else if ((userID === null || userID === void 0 ? void 0 : userID.id) == msg.author.id) {
+            msg.reply('You cannot ban yourself.' + emoji_random_1.default.random());
+        }
+        else if ((userID === null || userID === void 0 ? void 0 : userID.id) == ((_b = this.client.user) === null || _b === void 0 ? void 0 : _b.id)) {
+            msg.reply('Not funny. ' + emoji_random_1.default.random());
+        }
+        else if (!msg.guild.member(userID.id)) {
             msg.reply('Member does not exist in server.');
         }
         else {
-            msg.guild.members.ban(userID);
-            msg.say(`User **${userID}** has been banned!`).then(m => {
+            msg.guild.members.ban(userID.id);
+            msg.say(`**${userID}** has been banned!`).then(m => {
                 m.react('🇫');
             });
         }
     }
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFuLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL21vZGVyYXRpb24vYmFuLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsNkRBQStEO0FBRS9ELE1BQU0sQ0FBQyxPQUFPLEdBQUcsTUFBTSxhQUFjLFNBQVEsNkJBQU87SUFDaEQsWUFBWSxNQUFNO1FBQ2QsS0FBSyxDQUFDLE1BQU0sRUFBRTtZQUNWLElBQUksRUFBRSxLQUFLO1lBQ1gsT0FBTyxFQUFFLENBQUMsU0FBUyxFQUFFLFVBQVUsQ0FBQztZQUNoQyxLQUFLLEVBQUUsWUFBWTtZQUNuQixVQUFVLEVBQUUsS0FBSztZQUNqQixXQUFXLEVBQUUsY0FBYztZQUMzQixlQUFlLEVBQUUsQ0FBQyxlQUFlLEVBQUUsc0JBQXNCLEVBQUUsYUFBYSxDQUFDO1lBQ3pFLGlCQUFpQixFQUFFLENBQUMsZUFBZSxFQUFFLHNCQUFzQixFQUFFLGFBQWEsQ0FBQztZQUMzRSxRQUFRLEVBQUUsQ0FBQyxtQkFBbUIsQ0FBQztZQUMvQixTQUFTLEVBQUUsSUFBSTtZQUNmLFVBQVUsRUFBRTtnQkFDUixNQUFNLEVBQUUsQ0FBQztnQkFDVCxRQUFRLEVBQUUsRUFBRTthQUNmO1NBQ0osQ0FBQyxDQUFDO0lBQ1AsQ0FBQztJQUNELEdBQUcsQ0FBQyxHQUFvQjs7UUFDcEIsSUFBSSxNQUFNLFNBQUcsR0FBRyxDQUFDLFFBQVEsQ0FBQyxPQUFPLDBDQUFFLEtBQUssR0FBRyxFQUFFLENBQUE7UUFDN0MsSUFBSSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxFQUFFO1lBQzNCLEdBQUcsQ0FBQyxLQUFLLENBQUMsa0NBQWtDLENBQUMsQ0FBQTtTQUNoRDthQUFNO1lBQ0gsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFBO1lBQzdCLEdBQUcsQ0FBQyxHQUFHLENBQUMsVUFBVSxNQUFNLHFCQUFxQixDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFO2dCQUNwRCxDQUFDLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ2xCLENBQUMsQ0FBQyxDQUFBO1NBQ0w7SUFDTCxDQUFDO0NBQ0osQ0FBQyJ9
\ No newline at end of file
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFuLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL21vZGVyYXRpb24vYmFuLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsNkRBQStEO0FBQy9ELGdFQUFnQztBQUVoQyxNQUFNLENBQUMsT0FBTyxHQUFHLE1BQU0sYUFBYyxTQUFRLDZCQUFPO0lBQ2hELFlBQVksTUFBTTtRQUNkLEtBQUssQ0FBQyxNQUFNLEVBQUU7WUFDVixJQUFJLEVBQUUsS0FBSztZQUNYLE9BQU8sRUFBRSxDQUFDLFNBQVMsRUFBRSxVQUFVLENBQUM7WUFDaEMsS0FBSyxFQUFFLFlBQVk7WUFDbkIsVUFBVSxFQUFFLEtBQUs7WUFDakIsV0FBVyxFQUFFLGNBQWM7WUFDM0IsZUFBZSxFQUFFLENBQUMsZUFBZSxFQUFFLHNCQUFzQixFQUFFLGFBQWEsQ0FBQztZQUN6RSxpQkFBaUIsRUFBRSxDQUFDLGVBQWUsRUFBRSxzQkFBc0IsRUFBRSxhQUFhLENBQUM7WUFDM0UsUUFBUSxFQUFFO2dCQUNOLG1CQUFtQjtnQkFDbkIsdUJBQXVCO2dCQUN2Qix3QkFBd0I7YUFDM0I7WUFDRCxVQUFVLEVBQUU7Z0JBQ1IsTUFBTSxFQUFFLENBQUM7Z0JBQ1QsUUFBUSxFQUFFLEVBQUU7YUFDZjtZQUNELFNBQVMsRUFBRSxJQUFJO1NBQ2xCLENBQUMsQ0FBQztJQUNQLENBQUM7SUFDRCxHQUFHLENBQUMsR0FBb0I7O1FBQ3BCLElBQUksTUFBTSxTQUFHLEdBQUcsQ0FBQyxRQUFRLENBQUMsT0FBTywwQ0FBRSxLQUFLLEVBQUUsQ0FBQTtRQUMxQyxJQUFJLEVBQUMsTUFBTSxhQUFOLE1BQU0sdUJBQU4sTUFBTSxDQUFFLEVBQUUsQ0FBQSxFQUFFO1lBQ2IsR0FBRyxDQUFDLEtBQUssQ0FBQywyQkFBMkIsR0FBRyxzQkFBSyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUE7U0FDMUQ7YUFBTSxJQUFJLENBQUEsTUFBTSxhQUFOLE1BQU0sdUJBQU4sTUFBTSxDQUFFLEVBQUUsS0FBSSxHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUUsRUFBRTtZQUNwQyxHQUFHLENBQUMsS0FBSyxDQUFDLDBCQUEwQixHQUFHLHNCQUFLLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQTtTQUN6RDthQUFNLElBQUksQ0FBQSxNQUFNLGFBQU4sTUFBTSx1QkFBTixNQUFNLENBQUUsRUFBRSxZQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSwwQ0FBRSxFQUFFLENBQUEsRUFBRTtZQUMzQyxHQUFHLENBQUMsS0FBSyxDQUFDLGFBQWEsR0FBRyxzQkFBSyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUE7U0FDNUM7YUFBTSxJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxFQUFFO1lBQ3JDLEdBQUcsQ0FBQyxLQUFLLENBQUMsa0NBQWtDLENBQUMsQ0FBQTtTQUNoRDthQUFNO1lBQ0gsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQTtZQUNoQyxHQUFHLENBQUMsR0FBRyxDQUFDLEtBQUssTUFBTSxxQkFBcUIsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRTtnQkFDL0MsQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNsQixDQUFDLENBQUMsQ0FBQTtTQUNMO0lBQ0wsQ0FBQztDQUNKLENBQUMifQ==
\ No newline at end of file
diff --git a/dist/commands/moderation/kick.js b/dist/commands/moderation/kick.js
index a4ca192..dbee0b7 100644
--- a/dist/commands/moderation/kick.js
+++ b/dist/commands/moderation/kick.js
@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const discord_js_commando_1 = require("discord.js-commando");
+const emoji_random_1 = __importDefault(require("emoji-random"));
 module.exports = class KickModeration extends discord_js_commando_1.Command {
     constructor(client) {
         super(client, {
@@ -24,17 +28,26 @@ module.exports = class KickModeration extends discord_js_commando_1.Command {
         });
     }
     run(msg) {
-        var _a;
-        let userID = (_a = msg.mentions.members) === null || _a === void 0 ? void 0 : _a.first().id;
-        if (!msg.guild.member(userID)) {
+        var _a, _b;
+        let userID = (_a = msg.mentions.members) === null || _a === void 0 ? void 0 : _a.first();
+        if (!(userID === null || userID === void 0 ? void 0 : userID.id)) {
+            msg.reply('No member was mentioned. ' + emoji_random_1.default.random());
+        }
+        else if ((userID === null || userID === void 0 ? void 0 : userID.id) == msg.author.id) {
+            msg.reply('You cannot kick yourself.' + emoji_random_1.default.random());
+        }
+        else if ((userID === null || userID === void 0 ? void 0 : userID.id) == ((_b = this.client.user) === null || _b === void 0 ? void 0 : _b.id)) {
+            msg.reply('Not funny. ' + emoji_random_1.default.random());
+        }
+        else if (!msg.guild.member(userID.id)) {
             msg.reply('Member does not exist in server.');
         }
         else {
-            msg.guild.members.prune(userID);
-            msg.say(`User **${userID}** has been kicked!`).then(m => {
+            msg.guild.members.prune(userID.id);
+            msg.say(`**${userID}** has been kicked!`).then(m => {
                 m.react('🇫');
             });
         }
     }
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2ljay5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb21tYW5kcy9tb2RlcmF0aW9uL2tpY2sudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSw2REFBK0Q7QUFFL0QsTUFBTSxDQUFDLE9BQU8sR0FBRyxNQUFNLGNBQWUsU0FBUSw2QkFBTztJQUNqRCxZQUFZLE1BQU07UUFDZCxLQUFLLENBQUMsTUFBTSxFQUFFO1lBQ1YsSUFBSSxFQUFFLE1BQU07WUFDWixPQUFPLEVBQUUsQ0FBQyxVQUFVLEVBQUUsV0FBVyxDQUFDO1lBQ2xDLEtBQUssRUFBRSxZQUFZO1lBQ25CLFVBQVUsRUFBRSxNQUFNO1lBQ2xCLFdBQVcsRUFBRSxlQUFlO1lBQzVCLGVBQWUsRUFBRSxDQUFDLGVBQWUsRUFBRSxzQkFBc0IsRUFBRSxhQUFhLENBQUM7WUFDekUsaUJBQWlCLEVBQUUsQ0FBQyxlQUFlLEVBQUUsc0JBQXNCLEVBQUUsYUFBYSxDQUFDO1lBQzNFLFFBQVEsRUFBRTtnQkFDTixvQkFBb0I7Z0JBQ3BCLHdCQUF3QjtnQkFDeEIseUJBQXlCO2FBQzVCO1lBQ0QsVUFBVSxFQUFFO2dCQUNSLE1BQU0sRUFBRSxDQUFDO2dCQUNULFFBQVEsRUFBRSxFQUFFO2FBQ2Y7WUFDRCxTQUFTLEVBQUUsSUFBSTtTQUNsQixDQUFDLENBQUM7SUFDUCxDQUFDO0lBQ0QsR0FBRyxDQUFDLEdBQW9COztRQUNwQixJQUFJLE1BQU0sU0FBRyxHQUFHLENBQUMsUUFBUSxDQUFDLE9BQU8sMENBQUUsS0FBSyxHQUFHLEVBQUUsQ0FBQTtRQUM3QyxJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUU7WUFDM0IsR0FBRyxDQUFDLEtBQUssQ0FBQyxrQ0FBa0MsQ0FBQyxDQUFBO1NBQ2hEO2FBQU07WUFDSCxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUE7WUFDL0IsR0FBRyxDQUFDLEdBQUcsQ0FBQyxVQUFVLE1BQU0scUJBQXFCLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUU7Z0JBQ3BELENBQUMsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDbEIsQ0FBQyxDQUFDLENBQUE7U0FDTDtJQUNMLENBQUM7Q0FDSixDQUFDIn0=
\ No newline at end of file
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2ljay5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb21tYW5kcy9tb2RlcmF0aW9uL2tpY2sudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSw2REFBK0Q7QUFDL0QsZ0VBQWdDO0FBRWhDLE1BQU0sQ0FBQyxPQUFPLEdBQUcsTUFBTSxjQUFlLFNBQVEsNkJBQU87SUFDakQsWUFBWSxNQUFNO1FBQ2QsS0FBSyxDQUFDLE1BQU0sRUFBRTtZQUNWLElBQUksRUFBRSxNQUFNO1lBQ1osT0FBTyxFQUFFLENBQUMsVUFBVSxFQUFFLFdBQVcsQ0FBQztZQUNsQyxLQUFLLEVBQUUsWUFBWTtZQUNuQixVQUFVLEVBQUUsTUFBTTtZQUNsQixXQUFXLEVBQUUsZUFBZTtZQUM1QixlQUFlLEVBQUUsQ0FBQyxlQUFlLEVBQUUsc0JBQXNCLEVBQUUsYUFBYSxDQUFDO1lBQ3pFLGlCQUFpQixFQUFFLENBQUMsZUFBZSxFQUFFLHNCQUFzQixFQUFFLGFBQWEsQ0FBQztZQUMzRSxRQUFRLEVBQUU7Z0JBQ04sb0JBQW9CO2dCQUNwQix3QkFBd0I7Z0JBQ3hCLHlCQUF5QjthQUM1QjtZQUNELFVBQVUsRUFBRTtnQkFDUixNQUFNLEVBQUUsQ0FBQztnQkFDVCxRQUFRLEVBQUUsRUFBRTthQUNmO1lBQ0QsU0FBUyxFQUFFLElBQUk7U0FDbEIsQ0FBQyxDQUFDO0lBQ1AsQ0FBQztJQUNELEdBQUcsQ0FBQyxHQUFvQjs7UUFDcEIsSUFBSSxNQUFNLFNBQUcsR0FBRyxDQUFDLFFBQVEsQ0FBQyxPQUFPLDBDQUFFLEtBQUssRUFBRSxDQUFBO1FBQzFDLElBQUksRUFBQyxNQUFNLGFBQU4sTUFBTSx1QkFBTixNQUFNLENBQUUsRUFBRSxDQUFBLEVBQUU7WUFDYixHQUFHLENBQUMsS0FBSyxDQUFDLDJCQUEyQixHQUFHLHNCQUFLLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQTtTQUMxRDthQUFNLElBQUksQ0FBQSxNQUFNLGFBQU4sTUFBTSx1QkFBTixNQUFNLENBQUUsRUFBRSxLQUFJLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxFQUFFO1lBQ3BDLEdBQUcsQ0FBQyxLQUFLLENBQUMsMkJBQTJCLEdBQUcsc0JBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFBO1NBQzFEO2FBQU0sSUFBSSxDQUFBLE1BQU0sYUFBTixNQUFNLHVCQUFOLE1BQU0sQ0FBRSxFQUFFLFlBQUksSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLDBDQUFFLEVBQUUsQ0FBQSxFQUFFO1lBQzNDLEdBQUcsQ0FBQyxLQUFLLENBQUMsYUFBYSxHQUFHLHNCQUFLLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQTtTQUM1QzthQUFNLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLEVBQUU7WUFDckMsR0FBRyxDQUFDLEtBQUssQ0FBQyxrQ0FBa0MsQ0FBQyxDQUFBO1NBQ2hEO2FBQU07WUFDSCxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxDQUFBO1lBQ2xDLEdBQUcsQ0FBQyxHQUFHLENBQUMsS0FBSyxNQUFNLHFCQUFxQixDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFO2dCQUMvQyxDQUFDLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ2xCLENBQUMsQ0FBQyxDQUFBO1NBQ0w7SUFDTCxDQUFDO0NBQ0osQ0FBQyJ9
\ No newline at end of file