From 86d54afbc1490b7ff3a1246c07fa5c3b82a5272d Mon Sep 17 00:00:00 2001 From: 8cy <50817549+8cy@users.noreply.github.com> Date: Mon, 4 May 2020 03:38:09 -0700 Subject: add status changer, v9.2.2 --- dist/assets/json/month.json | 2 +- dist/commands/bot/status.js | 101 ++++++++++++++++++++++++++++++++++++ dist/config.json | 2 +- fix/utility/botstatus.js | 124 -------------------------------------------- package.json | 2 +- src/commands/bot/status.ts | 88 +++++++++++++++++++++++++++++++ src/config.json | 2 +- 7 files changed, 193 insertions(+), 128 deletions(-) create mode 100644 dist/commands/bot/status.js delete mode 100644 fix/utility/botstatus.js create mode 100644 src/commands/bot/status.ts diff --git a/dist/assets/json/month.json b/dist/assets/json/month.json index d02be0a..9f33ec7 100644 --- a/dist/assets/json/month.json +++ b/dist/assets/json/month.json @@ -11,4 +11,4 @@ "october", "november", "december" -] \ No newline at end of file +] diff --git a/dist/commands/bot/status.js b/dist/commands/bot/status.js new file mode 100644 index 0000000..95ad410 --- /dev/null +++ b/dist/commands/bot/status.js @@ -0,0 +1,101 @@ +"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")); +const config_json_1 = __importDefault(require("../../config.json")); +module.exports = class StatusBot extends discord_js_commando_1.Command { + constructor(client) { + super(client, { + name: 'status', + aliases: ['botstatus', 'bot-status'], + group: 'bot', + memberName: 'status', + description: 'Allows you to change the bots status', + args: [ + { + key: 'uType', + prompt: 'Would you like to change the status type or status message?', + type: 'string', + default: '' + }, + { + key: 'uActivity', + prompt: 'What would you like to set the status message to?', + type: 'string', + default: '' + } + ], + examples: [ + 's5n!botstatus type watching', + 's5n!status t w', + 's5n!status message youtube', + 's5n!bs m lol' + ], + ownerOnly: true, + guarded: true + }); + } + run(msg, { uType, uActivity }) { + var _a, _b, _c, _d, _e, _f, _g; + let bType = (_a = this.client.user) === null || _a === void 0 ? void 0 : _a.presence.activities[0].type; + let bActivity = (_b = this.client.user) === null || _b === void 0 ? void 0 : _b.presence.activities[0].name; + function uActivityCheck() { + if (uActivity == 'playing' || uActivity == 'p') { + return true; + } + else if (uActivity == 'streaming' || uActivity == 's') { + return true; + } + else if (uActivity == 'listening' || uActivity == 'l') { + return true; + } + else if (uActivity == 'watching' || uActivity == 'w') { + return true; + } + else { + return false; + } + } + if (uType == 'type' || uType == 't') { + if (uActivity == 'reset' || uActivity == 'r') { + (_c = this.client.user) === null || _c === void 0 ? void 0 : _c.setActivity(this.client.user.presence.activities[0].name, { + type: 'WATCHING' + }); + } + else { + if (uActivityCheck()) { + (_d = this.client.user) === null || _d === void 0 ? void 0 : _d.setActivity(this.client.user.presence.activities[0].name, { + type: uActivity + }); + } + else { + return msg.reply(`That is not a valid status type. ${emoji_random_1.default.random()}`); + } + } + } + else if (uType == 'message' || uType == 'msg' || uType == 'm') { + if (uActivity == 'reset' || uActivity == 'r') { + (_e = this.client.user) === null || _e === void 0 ? void 0 : _e.setActivity('uwu!help | v' + config_json_1.default['version'], { + type: bType + }); + } + else { + (_f = this.client.user) === null || _f === void 0 ? void 0 : _f.setActivity(uActivity, { + type: bType + }); + } + } + else if (uType == 'reset' || uType == 'r') { + (_g = this.client.user) === null || _g === void 0 ? void 0 : _g.setActivity('uwu!help | v' + config_json_1.default['version'], { + type: 'WATCHING' + }); + } + else { + return msg.reply(`That was not an option. ${emoji_random_1.default.random()}`); + } + } +}; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhdHVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL2JvdC9zdGF0dXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSw2REFBOEM7QUFDOUMsZ0VBQWdDO0FBQ2hDLG9FQUFzQztBQUV0QyxNQUFNLENBQUMsT0FBTyxHQUFHLE1BQU0sU0FBVSxTQUFRLDZCQUFPO0lBQzVDLFlBQVksTUFBTTtRQUNkLEtBQUssQ0FBQyxNQUFNLEVBQUU7WUFDVixJQUFJLEVBQUUsUUFBUTtZQUNkLE9BQU8sRUFBRSxDQUFDLFdBQVcsRUFBRSxZQUFZLENBQUM7WUFDcEMsS0FBSyxFQUFFLEtBQUs7WUFDWixVQUFVLEVBQUUsUUFBUTtZQUNwQixXQUFXLEVBQUUsc0NBQXNDO1lBQ25ELElBQUksRUFBRTtnQkFDRjtvQkFDSSxHQUFHLEVBQUUsT0FBTztvQkFDWixNQUFNLEVBQUUsNkRBQTZEO29CQUNyRSxJQUFJLEVBQUUsUUFBUTtvQkFDZCxPQUFPLEVBQUUsRUFBRTtpQkFDZDtnQkFDRDtvQkFDSSxHQUFHLEVBQUUsV0FBVztvQkFDaEIsTUFBTSxFQUFFLG1EQUFtRDtvQkFDM0QsSUFBSSxFQUFFLFFBQVE7b0JBQ2QsT0FBTyxFQUFFLEVBQUU7aUJBQ2Q7YUFDSjtZQUNELFFBQVEsRUFBRTtnQkFDTiw2QkFBNkI7Z0JBQzdCLGdCQUFnQjtnQkFDaEIsNEJBQTRCO2dCQUM1QixjQUFjO2FBQ2pCO1lBQ0QsU0FBUyxFQUFFLElBQUk7WUFDZixPQUFPLEVBQUUsSUFBSTtTQUNoQixDQUFDLENBQUM7SUFDUCxDQUFDO0lBQ0QsR0FBRyxDQUFDLEdBQUcsRUFBRSxFQUFFLEtBQUssRUFBRSxTQUFTLEVBQUU7O1FBQ3pCLElBQUksS0FBSyxTQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSwwQ0FBRSxRQUFRLENBQUMsVUFBVSxDQUFDLENBQUMsRUFBRSxJQUFJLENBQUM7UUFDMUQsSUFBSSxTQUFTLFNBQUcs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 \ No newline at end of file diff --git a/dist/config.json b/dist/config.json index 2b9c16f..6db41c5 100644 --- a/dist/config.json +++ b/dist/config.json @@ -1,7 +1,7 @@ { "secret": "Njk5NDczMjYzOTk4MjcxNDg5.XpU5oQ.btZuxVudhNllSQY6CxrXXtMJm9A", "yt-api-key": "AIzaSyCeG1lQAeInv4vjFv_eTL9IFAFNdQC9Nk8", - "version": "9.2.0", + "version": "9.2.2", "fortniteTrackerNetworkToken": "4cf21f95-5f1a-412a-b4a7-e5424adc314a", "maxMultipler": 100, "minMultipler": 1.01 diff --git a/fix/utility/botstatus.js b/fix/utility/botstatus.js deleted file mode 100644 index ccf7e68..0000000 --- a/fix/utility/botstatus.js +++ /dev/null @@ -1,124 +0,0 @@ -const { Command } = require('discord.js-commando'); -const emoji = require('discord.js'); - -module.exports = class BotStatusUtility extends Command { - constructor(client) { - super(client, { - name: 'botstatus', - aliases: ['status', 'bs'], - group: 'utility', - memberName: 'botstatus', - description: 'Allows you to change the bots status', - args: [ - { - key: 'userChangeType', - prompt: 'would you like to change the status message or type?', - type: 'string' - }, - { - key: 'userActivityName', - prompt: 'what would u like the message 2 be?', - type: 'string' - }, - { - key: 'userActivityType', - prompt: 'what would u like the status type to be?', - type: 'string' - } - ], - guildOnly: true, - examples: [ - 's5n!botstatus type watching', - 's5n!status t w', - 's5n!status message youtube', - 's5n!bs m lol' - ] - }); - } - run(msg, { userActivityName, userActivityType }) { - if (msg.member.hasPermission('KICK_MEMBERS')) { - var activityType = this.client.user.presence.activities[0].type; - var activityName = this.client.user.presence.activities[0].name; - - function activityTypeToWords() { - if (activityName == '0') { - var activityName = 'PLAYING'; - } else if (activityName == '1') { - var activityName = 'STREAMING'; - } else if (activityName == '2') { - var activityName = 'LISTENING'; - } else if (activityName == '3') { - var activityName = 'WATCHING'; - } - } - - if (userChangeType == 'reset' || userChangeType == 'r') { - this.client.user.setActivity('psycho ~uwu', { - type: 'LISTENING' - }); - msg.reply('status has been reset lol ' + emoji.random()); - } else if (userChangeType == 'format' || userChangeType == 'f') { - // Print full, proper format for the Discord.js setActivity() function - msg.reply('\n`' + this.client.user.setActivity.toString() + '`'); - } else if (userChangeType == 'message' || userChangeType == 'msg' || userChangeType == 'm') { - // This took way to long to complete lol, 2020/04/08, 00:12, my birthday lol - if (userChangeType == 'message') { - var m = userChangeType.join(' '); - var mf = m.slice(8, 22); - } else if (userChangeType == 'msg') { - var m = userChangeType.join(' '); - var mf = m.slice(4, 22); - } else if (userChangeType == 'm') { - var m = userChangeType.join(' '); - var mf = m.slice(2, 22); - } - - if (mf == 'reset' || mf == 'r') { - this.client.user.setActivity('psycho ~uwu', { - type: activityType - }); - - msg.reply('status message has been reset lol'); - } else { - this.client.user.setActivity(mf, { - type: activityType - }); - } - } else if (userChangeType == 'userChangeType' || args == 't') { - var m = userChangeType; - userChangeType.toLowerCase(); - if (userChangeType == 'playing' || userChangeType == 'p') { - var m = 'playing'; - - this.client.user.setActivity(activityName, { - type: 'playing' - }); - } else if (userChangeType == 'listening' || userChangeType == 'l') { - var m = 'LISTENING'; - - this.client.user.setActivity(activityName, { - type: m - }); - } else if (userChangeType == 'watching' || userChangeType == 'w') { - var m = 'WATCHING'; - - this.client.user.setActivity(activityName, { - type: m - }); - } else if (userChangeType == 'custom' || userChangeType == 'c') { - msg.reply('custom status is disabled due to discord api policies about self-botting :('); - } else if (userChangeType == 'reset' || userChangeType == 'r') { - this.client.user.setActivity(activityName, { - type: 'LISTENING' - }); - - msg.reply('status type has been reset lol'); - } - } else if (!args) { - msg.reply('no arguments specified'); - } - } else { - msg.reply('insufficent perms bruh'); - } - } -}; \ No newline at end of file diff --git a/package.json b/package.json index a6bb409..ff048c9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "package", - "version": "9.2.1", + "version": "9.2.2", "description": "A Discord bot that supports audio playback, fun commands, utilities, and soundsboard, and more to come!", "main": "./dist/app.js", "scripts": { diff --git a/src/commands/bot/status.ts b/src/commands/bot/status.ts new file mode 100644 index 0000000..272806f --- /dev/null +++ b/src/commands/bot/status.ts @@ -0,0 +1,88 @@ +import { Command } from 'discord.js-commando'; +import emoji from 'emoji-random' +import config from '../../config.json' + +module.exports = class StatusBot extends Command { + constructor(client) { + super(client, { + name: 'status', + aliases: ['botstatus', 'bot-status'], + group: 'bot', + memberName: 'status', + description: 'Allows you to change the bots status', + args: [ + { + key: 'uType', + prompt: 'Would you like to change the status type or status message?', + type: 'string', + default: '' + }, + { + key: 'uActivity', + prompt: 'What would you like to set the status message to?', + type: 'string', + default: '' + } + ], + examples: [ + 's5n!botstatus type watching', + 's5n!status t w', + 's5n!status message youtube', + 's5n!bs m lol' + ], + ownerOnly: true, + guarded: true + }); + } + run(msg, { uType, uActivity }) { + let bType = this.client.user?.presence.activities[0].type; + let bActivity = this.client.user?.presence.activities[0].name; + + function uActivityCheck() { + if (uActivity == 'playing' || uActivity == 'p') { + return true + } else if (uActivity == 'streaming' || uActivity == 's') { + return true + } else if (uActivity == 'listening' || uActivity == 'l') { + return true + } else if (uActivity == 'watching' || uActivity == 'w') { + return true + } else { + return false + } + } + + if (uType == 'type' || uType == 't') { + if (uActivity == 'reset' || uActivity == 'r') { + this.client.user?.setActivity(this.client.user.presence.activities[0].name, { + type: 'WATCHING' + }); + } else { + if (uActivityCheck()) { + this.client.user?.setActivity(this.client.user.presence.activities[0].name, { + type: uActivity + }); + // TODO: fix this not settings the type + } else { + return msg.reply(`That is not a valid status type. ${emoji.random()}`) + } + } + } else if (uType == 'message' || uType == 'msg' || uType == 'm') { + if (uActivity == 'reset' || uActivity == 'r') { + this.client.user?.setActivity('uwu!help | v' + config['version'], { + type: bType + }); + } else { + this.client.user?.setActivity(uActivity, { + type: bType + }); + } + } else if (uType == 'reset' || uType == 'r') { + this.client.user?.setActivity('uwu!help | v' + config['version'], { + type: 'WATCHING' + }); + } else { + return msg.reply(`That was not an option. ${emoji.random()}`) + } + } +}; \ No newline at end of file diff --git a/src/config.json b/src/config.json index 4a9aff1..caa75a4 100644 --- a/src/config.json +++ b/src/config.json @@ -1,7 +1,7 @@ { "secret":"Njk5NDczMjYzOTk4MjcxNDg5.XpU5oQ.btZuxVudhNllSQY6CxrXXtMJm9A", "yt-api-key":"AIzaSyCeG1lQAeInv4vjFv_eTL9IFAFNdQC9Nk8", - "version":"9.2.1", + "version":"9.2.2", "fortniteTrackerNetworkToken": "4cf21f95-5f1a-412a-b4a7-e5424adc314a", "maxMultipler": 100, "minMultipler": 1.01 -- cgit v1.2.3