From cd0f853a2e4732cea5356f9ee3603bb804b0ab1f Mon Sep 17 00:00:00 2001 From: IRONM00N <64110067+IRONM00N@users.noreply.github.com> Date: Wed, 26 May 2021 21:53:35 -0400 Subject: made some more changes --- src/commands/dev/eval.ts | 138 ------------- src/commands/dev/evalCommand.ts | 138 +++++++++++++ src/commands/dev/reload.ts | 44 ---- src/commands/dev/reloadCommand.ts | 44 ++++ src/commands/dev/setLevelCommand.ts | 91 +++++++++ src/commands/dev/setlevel.ts | 91 --------- src/commands/info/botInfoCommand.ts | 65 ++++++ src/commands/info/botinfo.ts | 65 ------ src/commands/info/help.ts | 107 ---------- src/commands/info/helpCommand.ts | 107 ++++++++++ src/commands/info/ping.ts | 68 ------- src/commands/info/pingCommand.ts | 68 +++++++ src/commands/info/pronouns.ts | 121 ----------- src/commands/info/pronounsCommand.ts | 121 +++++++++++ src/commands/moderation/ban.ts | 223 -------------------- src/commands/moderation/banCommand.ts | 224 +++++++++++++++++++++ src/commands/moderation/kick.ts | 120 ----------- src/commands/moderation/kickCommand.ts | 121 +++++++++++ src/commands/moderation/modlog.ts | 148 -------------- src/commands/moderation/modlogCommand.ts | 149 ++++++++++++++ src/commands/moderation/role.ts | 181 ----------------- src/commands/moderation/roleCommand.ts | 181 +++++++++++++++++ src/commands/moderation/warn.ts | 67 ------ src/commands/moderation/warnCommand.ts | 68 +++++++ .../moulberry-bush/capePermissionsCommand.ts | 126 ++++++++++++ src/commands/moulberry-bush/capeperms.ts | 126 ------------ src/commands/moulberry-bush/giveawayPingCommand.ts | 68 +++++++ src/commands/moulberry-bush/giveawayping.ts | 68 ------- src/commands/moulberry-bush/level.ts | 62 ------ src/commands/moulberry-bush/levelCommand.ts | 62 ++++++ src/commands/moulberry-bush/rule.ts | 188 ----------------- src/commands/moulberry-bush/ruleCommand.ts | 188 +++++++++++++++++ src/commands/server-config/prefix.ts | 71 ------- src/commands/server-config/prefixCommand.ts | 71 +++++++ src/listeners/client/ready.ts | 18 -- src/listeners/client/readyListener.ts | 18 ++ src/listeners/client/syncSlashCommandsListener.ts | 22 ++ src/listeners/client/syncslashcommands.ts | 22 -- src/listeners/commands/commandBlockedListener.ts | 34 ++++ src/listeners/commands/commandErrorListener.ts | 48 +++++ src/listeners/commands/commandStartedListener.ts | 24 +++ src/listeners/commands/commandblocked.ts | 34 ---- src/listeners/commands/commandstarted.ts | 24 --- src/listeners/commands/error.ts | 48 ----- .../commands/slashCommandErrorListener.ts | 48 +++++ src/listeners/commands/slashError.ts | 48 ----- src/listeners/guild/syncUnbanListener.ts | 24 +++ src/listeners/guild/syncunban.ts | 24 --- src/listeners/message/levelListener.ts | 40 ++++ src/listeners/message/levels.ts | 39 ---- src/tasks/Unban.ts | 49 ----- src/tasks/UnbanTask.ts | 49 +++++ 52 files changed, 2199 insertions(+), 2194 deletions(-) delete mode 100644 src/commands/dev/eval.ts create mode 100644 src/commands/dev/evalCommand.ts delete mode 100644 src/commands/dev/reload.ts create mode 100644 src/commands/dev/reloadCommand.ts create mode 100644 src/commands/dev/setLevelCommand.ts delete mode 100644 src/commands/dev/setlevel.ts create mode 100644 src/commands/info/botInfoCommand.ts delete mode 100644 src/commands/info/botinfo.ts delete mode 100644 src/commands/info/help.ts create mode 100644 src/commands/info/helpCommand.ts delete mode 100644 src/commands/info/ping.ts create mode 100644 src/commands/info/pingCommand.ts delete mode 100644 src/commands/info/pronouns.ts create mode 100644 src/commands/info/pronounsCommand.ts delete mode 100644 src/commands/moderation/ban.ts create mode 100644 src/commands/moderation/banCommand.ts delete mode 100644 src/commands/moderation/kick.ts create mode 100644 src/commands/moderation/kickCommand.ts delete mode 100644 src/commands/moderation/modlog.ts create mode 100644 src/commands/moderation/modlogCommand.ts delete mode 100644 src/commands/moderation/role.ts create mode 100644 src/commands/moderation/roleCommand.ts delete mode 100644 src/commands/moderation/warn.ts create mode 100644 src/commands/moderation/warnCommand.ts create mode 100644 src/commands/moulberry-bush/capePermissionsCommand.ts delete mode 100644 src/commands/moulberry-bush/capeperms.ts create mode 100644 src/commands/moulberry-bush/giveawayPingCommand.ts delete mode 100644 src/commands/moulberry-bush/giveawayping.ts delete mode 100644 src/commands/moulberry-bush/level.ts create mode 100644 src/commands/moulberry-bush/levelCommand.ts delete mode 100644 src/commands/moulberry-bush/rule.ts create mode 100644 src/commands/moulberry-bush/ruleCommand.ts delete mode 100644 src/commands/server-config/prefix.ts create mode 100644 src/commands/server-config/prefixCommand.ts delete mode 100644 src/listeners/client/ready.ts create mode 100644 src/listeners/client/readyListener.ts create mode 100644 src/listeners/client/syncSlashCommandsListener.ts delete mode 100644 src/listeners/client/syncslashcommands.ts create mode 100644 src/listeners/commands/commandBlockedListener.ts create mode 100644 src/listeners/commands/commandErrorListener.ts create mode 100644 src/listeners/commands/commandStartedListener.ts delete mode 100644 src/listeners/commands/commandblocked.ts delete mode 100644 src/listeners/commands/commandstarted.ts delete mode 100644 src/listeners/commands/error.ts create mode 100644 src/listeners/commands/slashCommandErrorListener.ts delete mode 100644 src/listeners/commands/slashError.ts create mode 100644 src/listeners/guild/syncUnbanListener.ts delete mode 100644 src/listeners/guild/syncunban.ts create mode 100644 src/listeners/message/levelListener.ts delete mode 100644 src/listeners/message/levels.ts delete mode 100644 src/tasks/Unban.ts create mode 100644 src/tasks/UnbanTask.ts (limited to 'src') diff --git a/src/commands/dev/eval.ts b/src/commands/dev/eval.ts deleted file mode 100644 index 83e63f6..0000000 --- a/src/commands/dev/eval.ts +++ /dev/null @@ -1,138 +0,0 @@ -/* eslint-disable @typescript-eslint/no-unused-vars */ -import { BushCommand } from '../../lib/extensions/BushCommand'; -import { MessageEmbed, Message } from 'discord.js'; -import { inspect, promisify } from 'util'; -import { exec } from 'child_process'; - -const clean = (text) => { - if (typeof text === 'string') - return text - .replace(/`/g, '`' + String.fromCharCode(8203)) - .replace(/@/g, '@' + String.fromCharCode(8203)); - else return text; -}; - -export default class EvalCommand extends BushCommand { - public constructor() { - super('eval', { - aliases: ['eval', 'ev'], - category: 'dev', - description: { - content: 'Use the command to eval stuff in the bot.', - usage: 'eval [--silent] [--depth #]', - examples: ['eval message.guild.name', 'eval this.client.ownerID'] - }, - args: [ - { - id: 'depth', - match: 'option', - type: 'number', - flag: '--depth', - default: 0 - }, - { - id: 'silent', - match: 'flag', - flag: '--silent' - }, - { - id: 'code', - match: 'rest', - type: 'string', - prompt: { - start: 'What would you like to eval?', - retry: 'Invalid code to eval. What would you like to eval?' - } - } - ], - ownerOnly: true, - clientPermissions: ['EMBED_LINKS'] - }); - } - - public async exec( - message: Message, - { depth, code, silent }: { depth: number; code: string; silent: boolean } - ): Promise { - const embed: MessageEmbed = new MessageEmbed(); - - try { - let output; - const me = message.member, - member = message.member, - bot = this.client, - guild = message.guild, - channel = message.channel, - config = this.client.config, - sh = promisify(exec), - models = this.client.db.models, - got = require('got'); // eslint-disable-line @typescript-eslint/no-var-requires - output = eval(code); - output = await output; - if (typeof output !== 'string') output = inspect(output, { depth }); - output = output.replace( - new RegExp(this.client.token, 'g'), - '[token omitted]' - ); - output = clean(output); - embed - .setTitle('✅ Evaled code successfully') - .addField( - '📥 Input', - code.length > 1012 - ? 'Too large to display. Hastebin: ' + - (await this.client.util.haste(code)) - : '```js\n' + code + '```' - ) - .addField( - '📤 Output', - output.length > 1012 - ? 'Too large to display. Hastebin: ' + - (await this.client.util.haste(output)) - : '```js\n' + output + '```' - ) - .setColor('#66FF00') - .setFooter( - message.author.username, - message.author.displayAvatarURL({ dynamic: true }) - ) - .setTimestamp(); - } catch (e) { - embed - .setTitle('❌ Code was not able to be evaled') - .addField( - '📥 Input', - code.length > 1012 - ? 'Too large to display. Hastebin: ' + - (await this.client.util.haste(code)) - : '```js\n' + code + '```' - ) - .addField( - '📤 Output', - e.length > 1012 - ? 'Too large to display. Hastebin: ' + - (await this.client.util.haste(e)) - : '```js\n' + - e + - '```Full stack:' + - (await this.client.util.haste(e.stack)) - ) - .setColor('#FF0000') - .setFooter( - message.author.username, - message.author.displayAvatarURL({ dynamic: true }) - ) - .setTimestamp(); - } - if (!silent) { - await message.util.send(embed); - } else { - try { - await message.author.send(embed); - await message.react(''); - } catch (e) { - await message.react('❌'); - } - } - } -} diff --git a/src/commands/dev/evalCommand.ts b/src/commands/dev/evalCommand.ts new file mode 100644 index 0000000..83e63f6 --- /dev/null +++ b/src/commands/dev/evalCommand.ts @@ -0,0 +1,138 @@ +/* eslint-disable @typescript-eslint/no-unused-vars */ +import { BushCommand } from '../../lib/extensions/BushCommand'; +import { MessageEmbed, Message } from 'discord.js'; +import { inspect, promisify } from 'util'; +import { exec } from 'child_process'; + +const clean = (text) => { + if (typeof text === 'string') + return text + .replace(/`/g, '`' + String.fromCharCode(8203)) + .replace(/@/g, '@' + String.fromCharCode(8203)); + else return text; +}; + +export default class EvalCommand extends BushCommand { + public constructor() { + super('eval', { + aliases: ['eval', 'ev'], + category: 'dev', + description: { + content: 'Use the command to eval stuff in the bot.', + usage: 'eval [--silent] [--depth #]', + examples: ['eval message.guild.name', 'eval this.client.ownerID'] + }, + args: [ + { + id: 'depth', + match: 'option', + type: 'number', + flag: '--depth', + default: 0 + }, + { + id: 'silent', + match: 'flag', + flag: '--silent' + }, + { + id: 'code', + match: 'rest', + type: 'string', + prompt: { + start: 'What would you like to eval?', + retry: 'Invalid code to eval. What would you like to eval?' + } + } + ], + ownerOnly: true, + clientPermissions: ['EMBED_LINKS'] + }); + } + + public async exec( + message: Message, + { depth, code, silent }: { depth: number; code: string; silent: boolean } + ): Promise { + const embed: MessageEmbed = new MessageEmbed(); + + try { + let output; + const me = message.member, + member = message.member, + bot = this.client, + guild = message.guild, + channel = message.channel, + config = this.client.config, + sh = promisify(exec), + models = this.client.db.models, + got = require('got'); // eslint-disable-line @typescript-eslint/no-var-requires + output = eval(code); + output = await output; + if (typeof output !== 'string') output = inspect(output, { depth }); + output = output.replace( + new RegExp(this.client.token, 'g'), + '[token omitted]' + ); + output = clean(output); + embed + .setTitle('✅ Evaled code successfully') + .addField( + '📥 Input', + code.length > 1012 + ? 'Too large to display. Hastebin: ' + + (await this.client.util.haste(code)) + : '```js\n' + code + '```' + ) + .addField( + '📤 Output', + output.length > 1012 + ? 'Too large to display. Hastebin: ' + + (await this.client.util.haste(output)) + : '```js\n' + output + '```' + ) + .setColor('#66FF00') + .setFooter( + message.author.username, + message.author.displayAvatarURL({ dynamic: true }) + ) + .setTimestamp(); + } catch (e) { + embed + .setTitle('❌ Code was not able to be evaled') + .addField( + '📥 Input', + code.length > 1012 + ? 'Too large to display. Hastebin: ' + + (await this.client.util.haste(code)) + : '```js\n' + code + '```' + ) + .addField( + '📤 Output', + e.length > 1012 + ? 'Too large to display. Hastebin: ' + + (await this.client.util.haste(e)) + : '```js\n' + + e + + '```Full stack:' + + (await this.client.util.haste(e.stack)) + ) + .setColor('#FF0000') + .setFooter( + message.author.username, + message.author.displayAvatarURL({ dynamic: true }) + ) + .setTimestamp(); + } + if (!silent) { + await message.util.send(embed); + } else { + try { + await message.author.send(embed); + await message.react(''); + } catch (e) { + await message.react('❌'); + } + } + } +} diff --git a/src/commands/dev/reload.ts b/src/commands/dev/reload.ts deleted file mode 100644 index 64e5745..0000000 --- a/src/commands/dev/reload.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { BushCommand } from '../../lib/extensions/BushCommand'; -import { stripIndent } from 'common-tags'; -import { Message } from 'discord.js'; -import { CommandInteraction } from 'discord.js'; - -export default class ReloadCommand extends BushCommand { - constructor() { - super('reload', { - aliases: ['reload'], - category: 'dev', - description: { - content: 'Reloads the bot', - usage: 'reload', - examples: ['reload'] - }, - ownerOnly: true, - typing: true - }); - } - - private async getResponse(): Promise { - try { - await this.client.util.shell('yarn rimraf dist/'); - await this.client.util.shell('yarn tsc'); - this.client.commandHandler.reloadAll(); - this.client.listenerHandler.reloadAll(); - this.client.inhibitorHandler.reloadAll(); - return '🔁 Successfully reloaded!'; - } catch (e) { - return stripIndent` - An error occured while reloading: - ${await this.client.util.haste(e.stack)} - `; - } - } - - public async exec(message: Message): Promise { - await message.util.send(await this.getResponse()); - } - - public async execSlash(message: CommandInteraction): Promise { - await message.reply(await this.getResponse()); - } -} diff --git a/src/commands/dev/reloadCommand.ts b/src/commands/dev/reloadCommand.ts new file mode 100644 index 0000000..64e5745 --- /dev/null +++ b/src/commands/dev/reloadCommand.ts @@ -0,0 +1,44 @@ +import { BushCommand } from '../../lib/extensions/BushCommand'; +import { stripIndent } from 'common-tags'; +import { Message } from 'discord.js'; +import { CommandInteraction } from 'discord.js'; + +export default class ReloadCommand extends BushCommand { + constructor() { + super('reload', { + aliases: ['reload'], + category: 'dev', + description: { + content: 'Reloads the bot', + usage: 'reload', + examples: ['reload'] + }, + ownerOnly: true, + typing: true + }); + } + + private async getResponse(): Promise { + try { + await this.client.util.shell('yarn rimraf dist/'); + await this.client.util.shell('yarn tsc'); + this.client.commandHandler.reloadAll(); + this.client.listenerHandler.reloadAll(); + this.client.inhibitorHandler.reloadAll(); + return '🔁 Successfully reloaded!'; + } catch (e) { + return stripIndent` + An error occured while reloading: + ${await this.client.util.haste(e.stack)} + `; + } + } + + public async exec(message: Message): Promise { + await message.util.send(await this.getResponse()); + } + + public async execSlash(message: CommandInteraction): Promise { + await message.reply(await this.getResponse()); + } +} diff --git a/src/commands/dev/setLevelCommand.ts b/src/commands/dev/setLevelCommand.ts new file mode 100644 index 0000000..d1701c5 --- /dev/null +++ b/src/commands/dev/setLevelCommand.ts @@ -0,0 +1,91 @@ +import { ApplicationCommandOptionType } from 'discord-api-types'; +import { CommandInteraction } from 'discord.js'; +import { User } from 'discord.js'; +import { Message } from 'discord.js'; +import { BushCommand } from '../../lib/extensions/BushCommand'; +import { SlashCommandOption } from '../../lib/extensions/Util'; +import { Level } from '../../lib/models'; +import AllowedMentions from '../../lib/utils/AllowedMentions'; + +export default class SetLevelCommand extends BushCommand { + constructor() { + super('setlevel', { + aliases: ['setlevel'], + category: 'dev', + description: { + content: 'Sets the level of a user', + usage: 'setlevel ', + examples: ['setlevel @Moulberry 69'] //nice + }, + args: [ + { + id: 'user', + type: 'user', + prompt: { + start: 'What user would you like to change the level of?', + retry: + 'Invalid user. What user would you like to change the level of?' + } + }, + { + id: 'level', + type: 'number', + prompt: { + start: 'What level would you like to set?', + retry: 'Invalid user. What level would you like to set?' + } + } + ], + ownerOnly: true, + slashCommandOptions: [ + { + type: ApplicationCommandOptionType.USER, + name: 'user', + description: 'The user to change the level of', + required: true + }, + { + type: ApplicationCommandOptionType.INTEGER, + name: 'level', + description: 'The level to set the user to', + required: true + } + ] + }); + } + + private async setLevel(user: User, level: number): Promise { + const [levelEntry] = await Level.findOrBuild({ + where: { + id: user.id + }, + defaults: { + id: user.id + } + }); + levelEntry.xp = Level.convertLevelToXp(level); + await levelEntry.save(); + return `Successfully set level of <@${user.id}> to \`${level}\` (\`${levelEntry.xp}\` XP)`; + } + + async exec( + message: Message, + { user, level }: { user: User; level: number } + ): Promise { + await message.util.send(await this.setLevel(user, level), { + allowedMentions: AllowedMentions.none() + }); + } + + async execSlash( + message: CommandInteraction, + { + user, + level + }: { user: SlashCommandOption; level: SlashCommandOption } + ): Promise { + await message.reply(await this.setLevel(user.user, level.value), { + allowedMentions: AllowedMentions.none() + }); + } +} diff --git a/src/commands/dev/setlevel.ts b/src/commands/dev/setlevel.ts deleted file mode 100644 index d1701c5..0000000 --- a/src/commands/dev/setlevel.ts +++ /dev/null @@ -1,91 +0,0 @@ -import { ApplicationCommandOptionType } from 'discord-api-types'; -import { CommandInteraction } from 'discord.js'; -import { User } from 'discord.js'; -import { Message } from 'discord.js'; -import { BushCommand } from '../../lib/extensions/BushCommand'; -import { SlashCommandOption } from '../../lib/extensions/Util'; -import { Level } from '../../lib/models'; -import AllowedMentions from '../../lib/utils/AllowedMentions'; - -export default class SetLevelCommand extends BushCommand { - constructor() { - super('setlevel', { - aliases: ['setlevel'], - category: 'dev', - description: { - content: 'Sets the level of a user', - usage: 'setlevel ', - examples: ['setlevel @Moulberry 69'] //nice - }, - args: [ - { - id: 'user', - type: 'user', - prompt: { - start: 'What user would you like to change the level of?', - retry: - 'Invalid user. What user would you like to change the level of?' - } - }, - { - id: 'level', - type: 'number', - prompt: { - start: 'What level would you like to set?', - retry: 'Invalid user. What level would you like to set?' - } - } - ], - ownerOnly: true, - slashCommandOptions: [ - { - type: ApplicationCommandOptionType.USER, - name: 'user', - description: 'The user to change the level of', - required: true - }, - { - type: ApplicationCommandOptionType.INTEGER, - name: 'level', - description: 'The level to set the user to', - required: true - } - ] - }); - } - - private async setLevel(user: User, level: number): Promise { - const [levelEntry] = await Level.findOrBuild({ - where: { - id: user.id - }, - defaults: { - id: user.id - } - }); - levelEntry.xp = Level.convertLevelToXp(level); - await levelEntry.save(); - return `Successfully set level of <@${user.id}> to \`${level}\` (\`${levelEntry.xp}\` XP)`; - } - - async exec( - message: Message, - { user, level }: { user: User; level: number } - ): Promise { - await message.util.send(await this.setLevel(user, level), { - allowedMentions: AllowedMentions.none() - }); - } - - async execSlash( - message: CommandInteraction, - { - user, - level - }: { user: SlashCommandOption; level: SlashCommandOption } - ): Promise { - await message.reply(await this.setLevel(user.user, level.value), { - allowedMentions: AllowedMentions.none() - }); - } -} diff --git a/src/commands/info/botInfoCommand.ts b/src/commands/info/botInfoCommand.ts new file mode 100644 index 0000000..e6a4fbb --- /dev/null +++ b/src/commands/info/botInfoCommand.ts @@ -0,0 +1,65 @@ +import { MessageEmbed, Message, CommandInteraction } from 'discord.js'; +import { BushCommand } from '../../lib/extensions/BushCommand'; +import { duration } from 'moment'; + +export default class BotInfoCommand extends BushCommand { + constructor() { + super('botinfo', { + aliases: ['botinfo'], + description: { + content: 'Shows information about the bot', + usage: 'botinfo', + examples: ['botinfo'] + } + }); + } + + private async generateEmbed(): Promise { + const owners = (await this.client.util.mapIDs(this.client.ownerID)) + .map((u) => u.tag) + .join('\n'); + const currentCommit = ( + await this.client.util.shell('git rev-parse HEAD') + ).stdout.replace('\n', ''); + const repoUrl = ( + await this.client.util.shell('git remote get-url origin') + ).stdout.replace('\n', ''); + const embed = new MessageEmbed() + .setTitle('Bot Info:') + .addFields([ + { + name: 'Owners', + value: owners, + inline: true + }, + { + name: 'Uptime', + value: this.client.util.capitalize( + duration(this.client.uptime, 'milliseconds').humanize() + ) + }, + { + name: 'User count', + value: this.client.users.cache.size, + inline: true + }, + { + name: 'Current commit', + value: `[${currentCommit.substring( + 0, + 7 + )}](${repoUrl}/commit/${currentCommit})` + } + ]) + .setTimestamp(); + return embed; + } + + public async exec(message: Message): Promise { + await message.util.send(await this.generateEmbed()); + } + + public async execSlash(message: CommandInteraction): Promise { + await message.reply(await this.generateEmbed()); + } +} diff --git a/src/commands/info/botinfo.ts b/src/commands/info/botinfo.ts deleted file mode 100644 index e6a4fbb..0000000 --- a/src/commands/info/botinfo.ts +++ /dev/null @@ -1,65 +0,0 @@ -import { MessageEmbed, Message, CommandInteraction } from 'discord.js'; -import { BushCommand } from '../../lib/extensions/BushCommand'; -import { duration } from 'moment'; - -export default class BotInfoCommand extends BushCommand { - constructor() { - super('botinfo', { - aliases: ['botinfo'], - description: { - content: 'Shows information about the bot', - usage: 'botinfo', - examples: ['botinfo'] - } - }); - } - - private async generateEmbed(): Promise { - const owners = (await this.client.util.mapIDs(this.client.ownerID)) - .map((u) => u.tag) - .join('\n'); - const currentCommit = ( - await this.client.util.shell('git rev-parse HEAD') - ).stdout.replace('\n', ''); - const repoUrl = ( - await this.client.util.shell('git remote get-url origin') - ).stdout.replace('\n', ''); - const embed = new MessageEmbed() - .setTitle('Bot Info:') - .addFields([ - { - name: 'Owners', - value: owners, - inline: true - }, - { - name: 'Uptime', - value: this.client.util.capitalize( - duration(this.client.uptime, 'milliseconds').humanize() - ) - }, - { - name: 'User count', - value: this.client.users.cache.size, - inline: true - }, - { - name: 'Current commit', - value: `[${currentCommit.substring( - 0, - 7 - )}](${repoUrl}/commit/${currentCommit})` - } - ]) - .setTimestamp(); - return embed; - } - - public async exec(message: Message): Promise { - await message.util.send(await this.generateEmbed()); - } - - public async execSlash(message: CommandInteraction): Promise { - await message.reply(await this.generateEmbed()); - } -} diff --git a/src/commands/info/help.ts b/src/commands/info/help.ts deleted file mode 100644 index 30c2a21..0000000 --- a/src/commands/info/help.ts +++ /dev/null @@ -1,107 +0,0 @@ -import { Message, MessageEmbed } from 'discord.js'; -import { BushCommand } from '../../lib/extensions/BushCommand'; -import { stripIndent } from 'common-tags'; -import { ApplicationCommandOptionType } from 'discord-api-types'; -import { CommandInteraction } from 'discord.js'; -import { SlashCommandOption } from '../../lib/extensions/Util'; - -export default class HelpCommand extends BushCommand { - constructor() { - super('help', { - aliases: ['help'], - description: { - content: 'Shows the commands of the bot', - usage: 'help', - examples: ['help'] - }, - clientPermissions: ['EMBED_LINKS'], - args: [ - { - id: 'command', - type: 'commandAlias' - } - ], - slashCommandOptions: [ - { - type: ApplicationCommandOptionType.STRING, - name: 'command', - description: 'The command to get help for', - required: false - } - ] - }); - } - - private generateEmbed(command?: BushCommand): MessageEmbed { - const prefix = this.handler.prefix; - if (!command) { - const embed = new MessageEmbed() - .addField( - 'Commands', - stripIndent`A list of available commands. - For additional info on a command, type \`${prefix}help \` - ` - ) - .setFooter( - `For more information about a command use "${this.client.config.prefix}help "` - ) - .setTimestamp(); - for (const category of this.handler.categories.values()) { - embed.addField( - `${category.id.replace(/(\b\w)/gi, (lc): string => - lc.toUpperCase() - )}`, - `${category - .filter((cmd): boolean => cmd.aliases.length > 0) - .map((cmd): string => `\`${cmd.aliases[0]}\``) - .join(' ')}` - ); - } - return embed; - } else { - const embed = new MessageEmbed() - .setColor([155, 200, 200]) - .setTitle( - `\`${command.description.usage ? command.description.usage : ''}\`` - ) - .addField( - 'Description', - `${command.description.content ? command.description.content : ''} ${ - command.ownerOnly ? '\n__Owner Only__' : '' - }` - ); - - if (command.aliases.length > 1) - embed.addField('Aliases', `\`${command.aliases.join('` `')}\``, true); - if (command.description.examples && command.description.examples.length) - embed.addField( - 'Examples', - `\`${command.description.examples.join('`\n`')}\``, - true - ); - return embed; - } - } - - public async exec( - message: Message, - { command }: { command: BushCommand } - ): Promise { - await message.util.send(this.generateEmbed(command)); - } - - public async execSlash( - message: CommandInteraction, - { command }: { command: SlashCommandOption } - ): Promise { - if (command) { - await message.reply( - this.generateEmbed( - this.handler.findCommand(command.value) as BushCommand - ) - ); - } else { - await message.reply(this.generateEmbed()); - } - } -} diff --git a/src/commands/info/helpCommand.ts b/src/commands/info/helpCommand.ts new file mode 100644 index 0000000..30c2a21 --- /dev/null +++ b/src/commands/info/helpCommand.ts @@ -0,0 +1,107 @@ +import { Message, MessageEmbed } from 'discord.js'; +import { BushCommand } from '../../lib/extensions/BushCommand'; +import { stripIndent } from 'common-tags'; +import { ApplicationCommandOptionType } from 'discord-api-types'; +import { CommandInteraction } from 'discord.js'; +import { SlashCommandOption } from '../../lib/extensions/Util'; + +export default class HelpCommand extends BushCommand { + constructor() { + super('help', { + aliases: ['help'], + description: { + content: 'Shows the commands of the bot', + usage: 'help', + examples: ['help'] + }, + clientPermissions: ['EMBED_LINKS'], + args: [ + { + id: 'command', + type: 'commandAlias' + } + ], + slashCommandOptions: [ + { + type: ApplicationCommandOptionType.STRING, + name: 'command', + description: 'The command to get help for', + required: false + } + ] + }); + } + + private generateEmbed(command?: BushCommand): MessageEmbed { + const prefix = this.handler.prefix; + if (!command) { + const embed = new MessageEmbed() + .addField( + 'Commands', + stripIndent`A list of available commands. + For additional info on a command, type \`${prefix}help \` + ` + ) + .setFooter( + `For more information about a command use "${this.client.config.prefix}help "` + ) + .setTimestamp(); + for (const category of this.handler.categories.values()) { + embed.addField( + `${category.id.replace(/(\b\w)/gi, (lc): string => + lc.toUpperCase() + )}`, + `${category + .filter((cmd): boolean => cmd.aliases.length > 0) + .map((cmd): string => `\`${cmd.aliases[0]}\``) + .join(' ')}` + ); + } + return embed; + } else { + const embed = new MessageEmbed() + .setColor([155, 200, 200]) + .setTitle( + `\`${command.description.usage ? command.description.usage : ''}\`` + ) + .addField( + 'Description', + `${command.description.content ? command.description.content : ''} ${ + command.ownerOnly ? '\n__Owner Only__' : '' + }` + ); + + if (command.aliases.length > 1) + embed.addField('Aliases', `\`${command.aliases.join('` `')}\``, true); + if (command.description.examples && command.description.examples.length) + embed.addField( + 'Examples', + `\`${command.description.examples.join('`\n`')}\``, + true + ); + return embed; + } + } + + public async exec( + message: Message, + { command }: { command: BushCommand } + ): Promise { + await message.util.send(this.generateEmbed(command)); + } + + public async execSlash( + message: CommandInteraction, + { command }: { command: SlashCommandOption } + ): Promise { + if (command) { + await message.reply( + this.generateEmbed( + this.handler.findCommand(command.value) as BushCommand + ) + ); + } else { + await message.reply(this.generateEmbed()); + } + } +} diff --git a/src/commands/info/ping.ts b/src/commands/info/ping.ts deleted file mode 100644 index 62b8e60..0000000 --- a/src/commands/info/ping.ts +++ /dev/null @@ -1,68 +0,0 @@ -import { CommandInteraction } from 'discord.js'; -import { Message } from 'discord.js'; -import { MessageEmbed } from 'discord.js'; -import { BushCommand } from '../../lib/extensions/BushCommand'; - -export default class PingCommand extends BushCommand { - constructor() { - super('ping', { - aliases: ['ping'], - description: { - content: 'Gets the latency of the bot', - usage: 'ping', - examples: ['ping'] - } - }); - } - - public async exec(message: Message): Promise { - const sentMessage = await message.util.send('Pong!'); - const timestamp: number = message.editedTimestamp - ? message.editedTimestamp - : message.createdTimestamp; - const botLatency = `\`\`\`\n ${Math.floor( - sentMessage.createdTimestamp - timestamp - )}ms \`\`\``; - const apiLatency = `\`\`\`\n ${Math.round( - message.client.ws.ping - )}ms \`\`\``; - const embed = new MessageEmbed() - .setTitle('Pong! 🏓') - .addField('Bot Latency', botLatency, true) - .addField('API Latency', apiLatency, true) - .setFooter( - message.author.username, - message.author.displayAvatarURL({ dynamic: true }) - ) - .setTimestamp(); - await sentMessage.edit({ - content: null, - embed - }); - } - - public async execSlash(message: CommandInteraction): Promise { - const timestamp1 = message.createdTimestamp; - await message.reply('Pong!'); - const timestamp2 = await message - .fetchReply() - .then((m) => (m as Message).createdTimestamp); - const botLatency = `\`\`\`\n ${Math.floor( - timestamp2 - timestamp1 - )}ms \`\`\``; - const apiLatency = `\`\`\`\n ${Math.round(this.client.ws.ping)}ms \`\`\``; - const embed = new MessageEmbed() - .setTitle('Pong! 🏓') - .addField('Bot Latency', botLatency, true) - .addField('API Latency', apiLatency, true) - .setFooter( - message.user.username, - message.user.displayAvatarURL({ dynamic: true }) - ) - .setTimestamp(); - await message.editReply({ - content: null, - embeds: [embed] - }); - } -} diff --git a/src/commands/info/pingCommand.ts b/src/commands/info/pingCommand.ts new file mode 100644 index 0000000..62b8e60 --- /dev/null +++ b/src/commands/info/pingCommand.ts @@ -0,0 +1,68 @@ +import { CommandInteraction } from 'discord.js'; +import { Message } from 'discord.js'; +import { MessageEmbed } from 'discord.js'; +import { BushCommand } from '../../lib/extensions/BushCommand'; + +export default class PingCommand extends BushCommand { + constructor() { + super('ping', { + aliases: ['ping'], + description: { + content: 'Gets the latency of the bot', + usage: 'ping', + examples: ['ping'] + } + }); + } + + public async exec(message: Message): Promise { + const sentMessage = await message.util.send('Pong!'); + const timestamp: number = message.editedTimestamp + ? message.editedTimestamp + : message.createdTimestamp; + const botLatency = `\`\`\`\n ${Math.floor( + sentMessage.createdTimestamp - timestamp + )}ms \`\`\``; + const apiLatency = `\`\`\`\n ${Math.round( + message.client.ws.ping + )}ms \`\`\``; + const embed = new MessageEmbed() + .setTitle('Pong! 🏓') + .addField('Bot Latency', botLatency, true) + .addField('API Latency', apiLatency, true) + .setFooter( + message.author.username, + message.author.displayAvatarURL({ dynamic: true }) + ) + .setTimestamp(); + await sentMessage.edit({ + content: null, + embed + }); + } + + public async execSlash(message: CommandInteraction): Promise { + const timestamp1 = message.createdTimestamp; + await message.reply('Pong!'); + const timestamp2 = await message + .fetchReply() + .then((m) => (m as Message).createdTimestamp); + const botLatency = `\`\`\`\n ${Math.floor( + timestamp2 - timestamp1 + )}ms \`\`\``; + const apiLatency = `\`\`\`\n ${Math.round(this.client.ws.ping)}ms \`\`\``; + const embed = new MessageEmbed() + .setTitle('Pong! 🏓') + .addField('Bot Latency', botLatency, true) + .addField('API Latency', apiLatency, true) + .setFooter( + message.user.username, + message.user.displayAvatarURL({ dynamic: true }) + ) + .setTimestamp(); + await message.editReply({ + content: null, + embeds: [embed] + }); + } +} diff --git a/src/commands/info/pronouns.ts b/src/commands/info/pronouns.ts deleted file mode 100644 index f30a981..0000000 --- a/src/commands/info/pronouns.ts +++ /dev/null @@ -1,121 +0,0 @@ -import { BushCommand } from '../../lib/extensions/BushCommand'; -import { User, Message, MessageEmbed } from 'discord.js'; -import got, { HTTPError } from 'got'; -import { CommandInteraction } from 'discord.js'; -import { ApplicationCommandOptionType } from 'discord-api-types'; -import { SlashCommandOption } from '../../lib/extensions/Util'; - -export const pronounMapping = { - unspecified: 'Unspecified', - hh: 'He/Him', - hi: 'He/It', - hs: 'He/She', - ht: 'He/They', - ih: 'It/Him', - ii: 'It/Its', - is: 'It/She', - it: 'It/They', - shh: 'She/He', - sh: 'She/Her', - si: 'She/It', - st: 'She/They', - th: 'They/He', - ti: 'They/It', - ts: 'They/She', - tt: 'They/Them', - any: 'Any pronouns', - other: 'Other pronouns', - ask: 'Ask me my pronouns', - avoid: 'Avoid pronouns, use my name' -}; -export type pronounsType = keyof typeof pronounMapping; - -export default class PronounsCommand extends BushCommand { - constructor() { - super('pronouns', { - aliases: ['pronouns', 'pronoun'], - category: 'utilities', - description: { - usage: 'pronouns ', - examples: ['pronouns IRONM00N'], - content: 'Finds the pronouns of a user using https://pronoundb.org.' - }, - args: [ - { - id: 'user', - type: 'user', - default: null - } - ], - clientPermissions: ['SEND_MESSAGES'], - slashCommandOptions: [ - { - type: ApplicationCommandOptionType.USER, - name: 'user', - description: 'The user to get pronouns for', - required: false - } - ], - slashEmphemeral: true // I'll add dynamic checking to this later - }); - } - async sendResponse( - message: Message | CommandInteraction, - user: User, - author: boolean - ): Promise { - try { - const apiRes: { pronouns: pronounsType } = await got - .get( - `https://pronoundb.org/api/v1/lookup?platform=discord&id=${user.id}` - ) - .json(); - if (message instanceof Message) { - message.reply( - new MessageEmbed({ - title: `${author ? 'Your' : `${user.tag}'s`} pronouns:`, - description: pronounMapping[apiRes.pronouns], - footer: { - text: 'Data provided by https://pronoundb.org/' - } - }) - ); - } else { - message.reply({ - embeds: [ - new MessageEmbed({ - title: `${author ? 'Your' : `${user.tag}'s`} pronouns:`, - description: pronounMapping[apiRes.pronouns], - footer: { - text: 'Data provided by https://pronoundb.org/' - } - }) - ] - }); - } - } catch (e) { - if (e instanceof HTTPError && e.response.statusCode === 404) { - if (author) { - await message.reply( - 'You do not appear to have any pronouns set. Please go to https://pronoundb.org/ and set your pronouns.' - ); - } else { - await message.reply( - `${user.tag} does not appear to have any pronouns set. Please tell them to go to https://pronoundb.org/ and set their pronouns.` - ); - } - } else throw e; - } - } - async exec(message: Message, { user }: { user?: User }): Promise { - const u = user || message.author; - await this.sendResponse(message, u, u.id === message.author.id); - } - async execSlash( - message: CommandInteraction, - { user }: { user?: SlashCommandOption } - ): Promise { - const u = user?.user || message.user; - await this.sendResponse(message, u, u.id === message.user.id); - } -} diff --git a/src/commands/info/pronounsCommand.ts b/src/commands/info/pronounsCommand.ts new file mode 100644 index 0000000..f30a981 --- /dev/null +++ b/src/commands/info/pronounsCommand.ts @@ -0,0 +1,121 @@ +import { BushCommand } from '../../lib/extensions/BushCommand'; +import { User, Message, MessageEmbed } from 'discord.js'; +import got, { HTTPError } from 'got'; +import { CommandInteraction } from 'discord.js'; +import { ApplicationCommandOptionType } from 'discord-api-types'; +import { SlashCommandOption } from '../../lib/extensions/Util'; + +export const pronounMapping = { + unspecified: 'Unspecified', + hh: 'He/Him', + hi: 'He/It', + hs: 'He/She', + ht: 'He/They', + ih: 'It/Him', + ii: 'It/Its', + is: 'It/She', + it: 'It/They', + shh: 'She/He', + sh: 'She/Her', + si: 'She/It', + st: 'She/They', + th: 'They/He', + ti: 'They/It', + ts: 'They/She', + tt: 'They/Them', + any: 'Any pronouns', + other: 'Other pronouns', + ask: 'Ask me my pronouns', + avoid: 'Avoid pronouns, use my name' +}; +export type pronounsType = keyof typeof pronounMapping; + +export default class PronounsCommand extends BushCommand { + constructor() { + super('pronouns', { + aliases: ['pronouns', 'pronoun'], + category: 'utilities', + description: { + usage: 'pronouns ', + examples: ['pronouns IRONM00N'], + content: 'Finds the pronouns of a user using https://pronoundb.org.' + }, + args: [ + { + id: 'user', + type: 'user', + default: null + } + ], + clientPermissions: ['SEND_MESSAGES'], + slashCommandOptions: [ + { + type: ApplicationCommandOptionType.USER, + name: 'user', + description: 'The user to get pronouns for', + required: false + } + ], + slashEmphemeral: true // I'll add dynamic checking to this later + }); + } + async sendResponse( + message: Message | CommandInteraction, + user: User, + author: boolean + ): Promise { + try { + const apiRes: { pronouns: pronounsType } = await got + .get( + `https://pronoundb.org/api/v1/lookup?platform=discord&id=${user.id}` + ) + .json(); + if (message instanceof Message) { + message.reply( + new MessageEmbed({ + title: `${author ? 'Your' : `${user.tag}'s`} pronouns:`, + description: pronounMapping[apiRes.pronouns], + footer: { + text: 'Data provided by https://pronoundb.org/' + } + }) + ); + } else { + message.reply({ + embeds: [ + new MessageEmbed({ + title: `${author ? 'Your' : `${user.tag}'s`} pronouns:`, + description: pronounMapping[apiRes.pronouns], + footer: { + text: 'Data provided by https://pronoundb.org/' + } + }) + ] + }); + } + } catch (e) { + if (e instanceof HTTPError && e.response.statusCode === 404) { + if (author) { + await message.reply( + 'You do not appear to have any pronouns set. Please go to https://pronoundb.org/ and set your pronouns.' + ); + } else { + await message.reply( + `${user.tag} does not appear to have any pronouns set. Please tell them to go to https://pronoundb.org/ and set their pronouns.` + ); + } + } else throw e; + } + } + async exec(message: Message, { user }: { user?: User }): Promise { + const u = user || message.author; + await this.sendResponse(message, u, u.id === message.author.id); + } + async execSlash( + message: CommandInteraction, + { user }: { user?: SlashCommandOption } + ): Promise { + const u = user?.user || message.user; + await this.sendResponse(message, u, u.id === message.user.id); + } +} diff --git a/src/commands/moderation/ban.ts b/src/commands/moderation/ban.ts deleted file mode 100644 index 1c3b074..0000000 --- a/src/commands/moderation/ban.ts +++ /dev/null @@ -1,223 +0,0 @@ -import { User } from 'discord.js'; -import { Guild } from '../../lib/models'; -import { BushCommand } from '../../lib/extensions/BushCommand'; -import { Ban, Modlog, ModlogType } from '../../lib/models'; -import moment from 'moment'; -import { Message } from 'discord.js'; -import { CommandInteraction } from 'discord.js'; -import { SlashCommandOption } from '../../lib/extensions/Util'; -import { ApplicationCommandOptionType } from 'discord-api-types'; - -const durationAliases: Record = { - weeks: ['w', 'weeks', 'week', 'wk', 'wks'], - days: ['d', 'days', 'day'], - hours: ['h', 'hours', 'hour', 'hr', 'hrs'], - minutes: ['m', 'min', 'mins', 'minutes', 'minute'], - months: ['mo', 'month', 'months'] -}; -const durationRegex = - /(?:(\d+)(d(?:ays?)?|h(?:ours?|rs?)?|m(?:inutes?|ins?)?|mo(?:nths?)?|w(?:eeks?|ks?)?)(?: |$))/g; - -export default class PrefixCommand extends BushCommand { - constructor() { - super('ban', { - aliases: ['ban'], - args: [ - { - id: 'user', - type: 'user', - prompt: { - start: 'What user would you like to ban?', - retry: 'Invalid response. What user would you like to ban?' - } - }, - { - id: 'reason', - match: 'rest' - }, - { - id: 'time', - match: 'option', - flag: '--time' - } - ], - clientPermissions: ['BAN_MEMBERS'], - userPermissions: ['BAN_MEMBERS'], - description: { - content: - 'Ban a member and log it in modlogs (with optional time to unban)', - usage: 'ban [--time]', - examples: [ - 'ban @Tyman being cool', - 'ban @Tyman being cool --time 7days' - ] - }, - slashCommandOptions: [ - { - type: ApplicationCommandOptionType.USER, - name: 'user', - description: 'The user to ban', - required: true - }, - { - type: ApplicationCommandOptionType.STRING, - name: 'reason', - description: 'The reason to show in modlogs and audit log', - required: false - }, - { - type: ApplicationCommandOptionType.STRING, - name: 'time', - description: - 'The time the user should be banned for (default permanent)', - required: false - } - ] - }); - } - async *genResponses( - message: Message | CommandInteraction, - user: User, - reason?: string, - time?: string - ): AsyncIterable { - const duration = moment.duration(); - let modlogEnry: Modlog; - let banEntry: Ban; - const translatedTime: string[] = []; - // Create guild entry so postgres doesn't get mad when I try and add a modlog entry - await Guild.findOrCreate({ - where: { - id: message.guild.id - }, - defaults: { - id: message.guild.id - } - }); - try { - try { - if (time) { - const parsed = [...time.matchAll(durationRegex)]; - if (parsed.length < 1) { - yield 'Invalid time.'; - return; - } - for (const part of parsed) { - const translated = Object.keys(durationAliases).find((k) => - durationAliases[k].includes(part[2]) - ); - translatedTime.push(part[1] + ' ' + translated); - duration.add( - Number(part[1]), - translated as 'weeks' | 'days' | 'hours' | 'months' | 'minutes' - ); - } - modlogEnry = Modlog.build({ - user: user.id, - guild: message.guild.id, - reason, - type: ModlogType.TEMPBAN, - duration: duration.asMilliseconds(), - moderator: - message instanceof CommandInteraction - ? message.user.id - : message.author.id - }); - banEntry = Ban.build({ - user: user.id, - guild: message.guild.id, - reason, - expires: new Date(new Date().getTime() + duration.asMilliseconds()), - modlog: modlogEnry.id - }); - } else { - modlogEnry = Modlog.build({ - user: user.id, - guild: message.guild.id, - reason, - type: ModlogType.BAN, - moderator: - message instanceof CommandInteraction - ? message.user.id - : message.author.id - }); - banEntry = Ban.build({ - user: user.id, - guild: message.guild.id, - reason, - modlog: modlogEnry.id - }); - } - await modlogEnry.save(); - await banEntry.save(); - } catch (e) { - console.error(e); - yield 'Error saving to database. Please report this to a developer.'; - return; - } - try { - await user.send( - `You were banned in ${message.guild.name} ${ - translatedTime.length >= 1 - ? `for ${translatedTime.join(', ')}` - : 'permanently' - } with reason \`${reason || 'No reason given'}\`` - ); - } catch (e) { - yield 'Error sending message to user'; - } - await message.guild.members.ban(user, { - reason: `Banned by ${ - message instanceof CommandInteraction - ? message.user.tag - : message.author.tag - } with ${reason ? `reason ${reason}` : 'no reason'}` - }); - yield `Banned <@!${user.id}> ${ - translatedTime.length >= 1 - ? `for ${translatedTime.join(', ')}` - : 'permanently' - } with reason \`${reason || 'No reason given'}\``; - } catch { - yield 'Error banning :/'; - await banEntry.destroy(); - await modlogEnry.destroy(); - return; - } - } - async exec( - message: Message, - { user, reason, time }: { user: User; reason?: string; time?: string } - ): Promise { - for await (const response of this.genResponses( - message, - user, - reason, - time - )) { - await message.util.send(response); - } - } - - async execSlash( - message: CommandInteraction, - { - user, - reason, - time - }: { - user: SlashCommandOption; - reason: SlashCommandOption; - time: SlashCommandOption; - } - ): Promise { - for await (const response of this.genResponses( - message, - user.user, - reason?.value, - time?.value - )) { - await message.reply(response); - } - } -} diff --git a/src/commands/moderation/banCommand.ts b/src/commands/moderation/banCommand.ts new file mode 100644 index 0000000..354fc0d --- /dev/null +++ b/src/commands/moderation/banCommand.ts @@ -0,0 +1,224 @@ +import { User } from 'discord.js'; +import { Guild } from '../../lib/models'; +import { BushCommand } from '../../lib/extensions/BushCommand'; +import { Ban, Modlog, ModlogType } from '../../lib/models'; +import moment from 'moment'; +import { Message } from 'discord.js'; +import { CommandInteraction } from 'discord.js'; +import { SlashCommandOption } from '../../lib/extensions/Util'; +import { ApplicationCommandOptionType } from 'discord-api-types'; + +const durationAliases: Record = { + weeks: ['w', 'weeks', 'week', 'wk', 'wks'], + days: ['d', 'days', 'day'], + hours: ['h', 'hours', 'hour', 'hr', 'hrs'], + minutes: ['m', 'min', 'mins', 'minutes', 'minute'], + months: ['mo', 'month', 'months'] +}; +const durationRegex = + /(?:(\d+)(d(?:ays?)?|h(?:ours?|rs?)?|m(?:inutes?|ins?)?|mo(?:nths?)?|w(?:eeks?|ks?)?)(?: |$))/g; + +export default class BanCommand extends BushCommand { + constructor() { + super('ban', { + aliases: ['ban'], + category: "moderation", + args: [ + { + id: 'user', + type: 'user', + prompt: { + start: 'What user would you like to ban?', + retry: 'Invalid response. What user would you like to ban?' + } + }, + { + id: 'reason', + match: 'rest' + }, + { + id: 'time', + match: 'option', + flag: '--time' + } + ], + clientPermissions: ['BAN_MEMBERS'], + userPermissions: ['BAN_MEMBERS'], + description: { + content: + 'Ban a member and log it in modlogs (with optional time to unban)', + usage: 'ban [--time]', + examples: [ + 'ban @Tyman being cool', + 'ban @Tyman being cool --time 7days' + ] + }, + slashCommandOptions: [ + { + type: ApplicationCommandOptionType.USER, + name: 'user', + description: 'The user to ban', + required: true + }, + { + type: ApplicationCommandOptionType.STRING, + name: 'reason', + description: 'The reason to show in modlogs and audit log', + required: false + }, + { + type: ApplicationCommandOptionType.STRING, + name: 'time', + description: + 'The time the user should be banned for (default permanent)', + required: false + } + ] + }); + } + async *genResponses( + message: Message | CommandInteraction, + user: User, + reason?: string, + time?: string + ): AsyncIterable { + const duration = moment.duration(); + let modlogEnry: Modlog; + let banEntry: Ban; + const translatedTime: string[] = []; + // Create guild entry so postgres doesn't get mad when I try and add a modlog entry + await Guild.findOrCreate({ + where: { + id: message.guild.id + }, + defaults: { + id: message.guild.id + } + }); + try { + try { + if (time) { + const parsed = [...time.matchAll(durationRegex)]; + if (parsed.length < 1) { + yield 'Invalid time.'; + return; + } + for (const part of parsed) { + const translated = Object.keys(durationAliases).find((k) => + durationAliases[k].includes(part[2]) + ); + translatedTime.push(part[1] + ' ' + translated); + duration.add( + Number(part[1]), + translated as 'weeks' | 'days' | 'hours' | 'months' | 'minutes' + ); + } + modlogEnry = Modlog.build({ + user: user.id, + guild: message.guild.id, + reason, + type: ModlogType.TEMPBAN, + duration: duration.asMilliseconds(), + moderator: + message instanceof CommandInteraction + ? message.user.id + : message.author.id + }); + banEntry = Ban.build({ + user: user.id, + guild: message.guild.id, + reason, + expires: new Date(new Date().getTime() + duration.asMilliseconds()), + modlog: modlogEnry.id + }); + } else { + modlogEnry = Modlog.build({ + user: user.id, + guild: message.guild.id, + reason, + type: ModlogType.BAN, + moderator: + message instanceof CommandInteraction + ? message.user.id + : message.author.id + }); + banEntry = Ban.build({ + user: user.id, + guild: message.guild.id, + reason, + modlog: modlogEnry.id + }); + } + await modlogEnry.save(); + await banEntry.save(); + } catch (e) { + console.error(e); + yield 'Error saving to database. Please report this to a developer.'; + return; + } + try { + await user.send( + `You were banned in ${message.guild.name} ${ + translatedTime.length >= 1 + ? `for ${translatedTime.join(', ')}` + : 'permanently' + } with reason \`${reason || 'No reason given'}\`` + ); + } catch (e) { + yield 'Error sending message to user'; + } + await message.guild.members.ban(user, { + reason: `Banned by ${ + message instanceof CommandInteraction + ? message.user.tag + : message.author.tag + } with ${reason ? `reason ${reason}` : 'no reason'}` + }); + yield `Banned <@!${user.id}> ${ + translatedTime.length >= 1 + ? `for ${translatedTime.join(', ')}` + : 'permanently' + } with reason \`${reason || 'No reason given'}\``; + } catch { + yield 'Error banning :/'; + await banEntry.destroy(); + await modlogEnry.destroy(); + return; + } + } + async exec( + message: Message, + { user, reason, time }: { user: User; reason?: string; time?: string } + ): Promise { + for await (const response of this.genResponses( + message, + user, + reason, + time + )) { + await message.util.send(response); + } + } + + async execSlash( + message: CommandInteraction, + { + user, + reason, + time + }: { + user: SlashCommandOption; + reason: SlashCommandOption; + time: SlashCommandOption; + } + ): Promise { + for await (const response of this.genResponses( + message, + user.user, + reason?.value, + time?.value + )) { + await message.reply(response); + } + } +} diff --git a/src/commands/moderation/kick.ts b/src/commands/moderation/kick.ts deleted file mode 100644 index c21352f..0000000 --- a/src/commands/moderation/kick.ts +++ /dev/null @@ -1,120 +0,0 @@ -import { BushCommand } from '../../lib/extensions/BushCommand'; -import { Guild, Modlog, ModlogType } from '../../lib/models'; -import { GuildMember, Message } from 'discord.js'; -import { ApplicationCommandOptionType } from 'discord-api-types'; -import { CommandInteraction } from 'discord.js'; - -export default class KickCommand extends BushCommand { - constructor() { - super('kick', { - aliases: ['kick'], - args: [ - { - id: 'user', - type: 'member', - prompt: { - start: 'What user would you like to kick?', - retry: 'Invalid response. What user would you like to kick?' - } - }, - { - id: 'reason' - } - ], - clientPermissions: ['KICK_MEMBERS'], - userPermissions: ['KICK_MEMBERS'], - description: { - content: 'Kick a member and log it in modlogs', - usage: 'kick ', - examples: ['kick @Tyman being cool'] - }, - slashCommandOptions: [ - { - type: ApplicationCommandOptionType.USER, - name: 'user', - description: 'The user to kick', - required: true - }, - { - type: ApplicationCommandOptionType.STRING, - name: 'reason', - description: 'The reason to show in modlogs and audit log', - required: false - } - ] - }); - } - - private async *genResponses( - message: Message | CommandInteraction, - user: GuildMember, - reason?: string - ): AsyncIterable { - let modlogEnry: Modlog; - // Create guild entry so postgres doesn't get mad when I try and add a modlog entry - await Guild.findOrCreate({ - where: { - id: message.guild.id - }, - defaults: { - id: message.guild.id - } - }); - try { - modlogEnry = Modlog.build({ - user: user.id, - guild: message.guild.id, - moderator: - message instanceof Message ? message.author.id : message.user.id, - type: ModlogType.KICK, - reason - }); - await modlogEnry.save(); - } catch (e) { - console.error(e); - yield 'Error saving to database. Please report this to a developer.'; - return; - } - try { - await user.send( - `You were kicked in ${message.guild.name} with reason \`${ - reason || 'No reason given' - }\`` - ); - } catch (e) { - yield 'Error sending message to user'; - } - try { - await user.kick( - `Kicked by ${ - message instanceof Message ? message.author.tag : message.user.tag - } with ${reason ? `reason ${reason}` : 'no reason'}` - ); - } catch { - yield 'Error kicking :/'; - await modlogEnry.destroy(); - return; - } - yield `Kicked <@!${user.id}> with reason \`${ - reason || 'No reason given' - }\``; - } - - async exec( - message: Message, - { user, reason }: { user: GuildMember; reason?: string } - ): Promise { - for await (const response of this.genResponses(message, user, reason)) { - await message.util.send(response); - } - } - - async execSlash( - message: CommandInteraction, - { user, reason }: { user: GuildMember; reason?: string } - ): Promise { - for await (const response of this.genResponses(message, user, reason)) { - await message.reply(response); - } - } -} diff --git a/src/commands/moderation/kickCommand.ts b/src/commands/moderation/kickCommand.ts new file mode 100644 index 0000000..132ca31 --- /dev/null +++ b/src/commands/moderation/kickCommand.ts @@ -0,0 +1,121 @@ +import { BushCommand } from '../../lib/extensions/BushCommand'; +import { Guild, Modlog, ModlogType } from '../../lib/models'; +import { GuildMember, Message } from 'discord.js'; +import { ApplicationCommandOptionType } from 'discord-api-types'; +import { CommandInteraction } from 'discord.js'; + +export default class KickCommand extends BushCommand { + constructor() { + super('kick', { + aliases: ['kick'], + category: "moderation", + args: [ + { + id: 'user', + type: 'member', + prompt: { + start: 'What user would you like to kick?', + retry: 'Invalid response. What user would you like to kick?' + } + }, + { + id: 'reason' + } + ], + clientPermissions: ['KICK_MEMBERS'], + userPermissions: ['KICK_MEMBERS'], + description: { + content: 'Kick a member and log it in modlogs', + usage: 'kick ', + examples: ['kick @Tyman being cool'] + }, + slashCommandOptions: [ + { + type: ApplicationCommandOptionType.USER, + name: 'user', + description: 'The user to kick', + required: true + }, + { + type: ApplicationCommandOptionType.STRING, + name: 'reason', + description: 'The reason to show in modlogs and audit log', + required: false + } + ] + }); + } + + private async *genResponses( + message: Message | CommandInteraction, + user: GuildMember, + reason?: string + ): AsyncIterable { + let modlogEnry: Modlog; + // Create guild entry so postgres doesn't get mad when I try and add a modlog entry + await Guild.findOrCreate({ + where: { + id: message.guild.id + }, + defaults: { + id: message.guild.id + } + }); + try { + modlogEnry = Modlog.build({ + user: user.id, + guild: message.guild.id, + moderator: + message instanceof Message ? message.author.id : message.user.id, + type: ModlogType.KICK, + reason + }); + await modlogEnry.save(); + } catch (e) { + console.error(e); + yield 'Error saving to database. Please report this to a developer.'; + return; + } + try { + await user.send( + `You were kicked in ${message.guild.name} with reason \`${ + reason || 'No reason given' + }\`` + ); + } catch (e) { + yield 'Error sending message to user'; + } + try { + await user.kick( + `Kicked by ${ + message instanceof Message ? message.author.tag : message.user.tag + } with ${reason ? `reason ${reason}` : 'no reason'}` + ); + } catch { + yield 'Error kicking :/'; + await modlogEnry.destroy(); + return; + } + yield `Kicked <@!${user.id}> with reason \`${ + reason || 'No reason given' + }\``; + } + + async exec( + message: Message, + { user, reason }: { user: GuildMember; reason?: string } + ): Promise { + for await (const response of this.genResponses(message, user, reason)) { + await message.util.send(response); + } + } + + async execSlash( + message: CommandInteraction, + { user, reason }: { user: GuildMember; reason?: string } + ): Promise { + for await (const response of this.genResponses(message, user, reason)) { + await message.reply(response); + } + } +} diff --git a/src/commands/moderation/modlog.ts b/src/commands/moderation/modlog.ts deleted file mode 100644 index b7923ca..0000000 --- a/src/commands/moderation/modlog.ts +++ /dev/null @@ -1,148 +0,0 @@ -import { BushCommand } from '../../lib/extensions/BushCommand'; -import { Message } from 'discord.js'; -import { Modlog } from '../../lib/models'; -import { MessageEmbed } from 'discord.js'; -import moment from 'moment'; -import { stripIndent } from 'common-tags'; -import { Argument } from 'discord-akairo'; - -export default class ModlogCommand extends BushCommand { - constructor() { - super('modlog', { - aliases: ['modlog', 'modlogs'], - args: [ - { - id: 'search', - prompt: { - start: 'What modlog id or user would you like to see?' - } - }, - { - id: 'page', - type: 'number' - } - ], - userPermissions: ['MANAGE_MESSAGES'], - description: { - content: "View a user's modlogs, or view a specific modlog entry", - usage: 'warn [page]', - examples: ['modlogs @Tyman', 'modlogs @Tyman 3'] - } - }); - } - *args(): unknown { - const search = yield { - id: 'search', - type: Argument.union('user', 'string'), - prompt: { - start: 'What modlog id or user would you like to see?' - } - }; - if (typeof search === 'string') return { search, page: null }; - else { - const page = yield { - id: 'page', - type: 'number', - prompt: { - start: 'What page?', - retry: 'Not a number. What page?', - optional: true - } - }; - return { search, page }; - } - } - async exec( - message: Message, - { search, page }: { search: string; page: number } - ): Promise { - const foundUser = await this.client.util.resolveUserAsync(search); - if (foundUser) { - const logs = await Modlog.findAll({ - where: { - guild: message.guild.id, - user: foundUser.id - }, - order: [['createdAt', 'ASC']] - }); - const niceLogs: string[] = []; - for (const log of logs) { - niceLogs.push(stripIndent` - ID: ${log.id} - Type: ${log.type.toLowerCase()} - User: <@!${log.user}> (${log.user}) - Moderator: <@!${log.moderator}> (${log.moderator}) - Duration: ${ - log.duration - ? moment.duration(log.duration, 'milliseconds').humanize() - : 'N/A' - } - Reason: ${log.reason || 'None given'} - ${this.client.util.ordinal(logs.indexOf(log) + 1)} action - `); - } - const chunked: string[][] = this.client.util.chunk(niceLogs, 3); - const embedPages = chunked.map( - (e, i) => - new MessageEmbed({ - title: `Modlogs page ${i + 1}`, - description: e.join( - '\n-------------------------------------------------------\n' - ), - footer: { - text: `Page ${i + 1}/${chunked.length}` - } - }) - ); - if (page) { - await message.util.send(embedPages[page - 1]); - return; - } else { - await message.util.send(embedPages[0]); - return; - } - } else if (search) { - const entry = await Modlog.findByPk(search); - if (!entry) { - await message.util.send('That modlog does not exist.'); - return; - } - await message.util.send( - new MessageEmbed({ - title: `Modlog ${entry.id}`, - fields: [ - { - name: 'Type', - value: entry.type.toLowerCase(), - inline: true - }, - { - name: 'Duration', - value: `${ - entry.duration - ? moment.duration(entry.duration, 'milliseconds').humanize() - : 'N/A' - }`, - inline: true - }, - { - name: 'Reason', - value: `${entry.reason || 'None given'}`, - inline: true - }, - { - name: 'Moderator', - value: `<@!${entry.moderator}> (${entry.moderator})`, - inline: true - }, - { - name: 'User', - value: `<@!${entry.user}> (${entry.user})`, - inline: true - } - ] - }) - ); - } - } -} diff --git a/src/commands/moderation/modlogCommand.ts b/src/commands/moderation/modlogCommand.ts new file mode 100644 index 0000000..3e394ba --- /dev/null +++ b/src/commands/moderation/modlogCommand.ts @@ -0,0 +1,149 @@ +import { BushCommand } from '../../lib/extensions/BushCommand'; +import { Message } from 'discord.js'; +import { Modlog } from '../../lib/models'; +import { MessageEmbed } from 'discord.js'; +import moment from 'moment'; +import { stripIndent } from 'common-tags'; +import { Argument } from 'discord-akairo'; + +export default class ModlogCommand extends BushCommand { + constructor() { + super('modlog', { + aliases: ['modlog', 'modlogs'], + category: "moderation", + args: [ + { + id: 'search', + prompt: { + start: 'What modlog id or user would you like to see?' + } + }, + { + id: 'page', + type: 'number' + } + ], + userPermissions: ['MANAGE_MESSAGES'], + description: { + content: "View a user's modlogs, or view a specific modlog entry", + usage: 'warn [page]', + examples: ['modlogs @Tyman', 'modlogs @Tyman 3'] + } + }); + } + *args(): unknown { + const search = yield { + id: 'search', + type: Argument.union('user', 'string'), + prompt: { + start: 'What modlog id or user would you like to see?' + } + }; + if (typeof search === 'string') return { search, page: null }; + else { + const page = yield { + id: 'page', + type: 'number', + prompt: { + start: 'What page?', + retry: 'Not a number. What page?', + optional: true + } + }; + return { search, page }; + } + } + async exec( + message: Message, + { search, page }: { search: string; page: number } + ): Promise { + const foundUser = await this.client.util.resolveUserAsync(search); + if (foundUser) { + const logs = await Modlog.findAll({ + where: { + guild: message.guild.id, + user: foundUser.id + }, + order: [['createdAt', 'ASC']] + }); + const niceLogs: string[] = []; + for (const log of logs) { + niceLogs.push(stripIndent` + ID: ${log.id} + Type: ${log.type.toLowerCase()} + User: <@!${log.user}> (${log.user}) + Moderator: <@!${log.moderator}> (${log.moderator}) + Duration: ${ + log.duration + ? moment.duration(log.duration, 'milliseconds').humanize() + : 'N/A' + } + Reason: ${log.reason || 'None given'} + ${this.client.util.ordinal(logs.indexOf(log) + 1)} action + `); + } + const chunked: string[][] = this.client.util.chunk(niceLogs, 3); + const embedPages = chunked.map( + (e, i) => + new MessageEmbed({ + title: `Modlogs page ${i + 1}`, + description: e.join( + '\n-------------------------------------------------------\n' + ), + footer: { + text: `Page ${i + 1}/${chunked.length}` + } + }) + ); + if (page) { + await message.util.send(embedPages[page - 1]); + return; + } else { + await message.util.send(embedPages[0]); + return; + } + } else if (search) { + const entry = await Modlog.findByPk(search); + if (!entry) { + await message.util.send('That modlog does not exist.'); + return; + } + await message.util.send( + new MessageEmbed({ + title: `Modlog ${entry.id}`, + fields: [ + { + name: 'Type', + value: entry.type.toLowerCase(), + inline: true + }, + { + name: 'Duration', + value: `${ + entry.duration + ? moment.duration(entry.duration, 'milliseconds').humanize() + : 'N/A' + }`, + inline: true + }, + { + name: 'Reason', + value: `${entry.reason || 'None given'}`, + inline: true + }, + { + name: 'Moderator', + value: `<@!${entry.moderator}> (${entry.moderator})`, + inline: true + }, + { + name: 'User', + value: `<@!${entry.user}> (${entry.user})`, + inline: true + } + ] + }) + ); + } + } +} diff --git a/src/commands/moderation/role.ts b/src/commands/moderation/role.ts deleted file mode 100644 index 29339a3..0000000 --- a/src/commands/moderation/role.ts +++ /dev/null @@ -1,181 +0,0 @@ -/* eslint-disable @typescript-eslint/no-empty-function */ -import { BushCommand } from '../../lib/extensions/BushCommand'; -import AllowedMentions from '../../lib/utils/AllowedMentions'; -import { Message, Role, GuildMember } from 'discord.js'; -import { ApplicationCommandOptionType } from 'discord-api-types'; - -export default class RoleCommand extends BushCommand { - private roleWhitelist: Record = { - 'Partner': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], - 'Suggester': [ - '*', - 'Admin Perms', - 'Sr. Moderator', - 'Moderator', - 'Helper', - 'Trial Helper', - 'Contributor' - ], - 'Level Locked': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], - 'No Files': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], - 'No Reactions': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], - 'No Links': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], - 'No Bots': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], - 'No VC': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], - 'No Giveaways': [ - '*', - 'Admin Perms', - 'Sr. Moderator', - 'Moderator', - 'Helper' - ], - 'No Support': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], - 'Giveaway Donor': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], - 'Giveaway (200m)': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], - 'Giveaway (100m)': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], - 'Giveaway (50m)': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], - 'Giveaway (25m)': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], - 'Giveaway (10m)': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], - 'Giveaway (5m)': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], - 'Giveaway (1m)': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'] - }; - constructor() { - super('role', { - aliases: ['role', 'addrole', 'removerole'], - category: "Moulberry's Bush", - description: { - content: "Manages users' roles.", - usage: 'role ', - examples: ['role add tyman adminperms'] - }, - clientPermissions: ['MANAGE_ROLES', 'EMBED_LINKS', 'SEND_MESSAGES'], - channel: 'guild', - typing: true, - args: [ - { - id: 'user', - type: 'member', - prompt: { - start: `What user do you want to add/remove the role on?`, - retry: `<:error:837123021016924261> Choose a valid user to add/remove the role on.` - } - }, - { - id: 'role', - type: 'role', - match: 'restContent', - prompt: { - start: `What role do you want to add/remove?`, - retry: `<:error:837123021016924261> Choose a valid role to add/remove.` - } - } - ], - slashCommandOptions: [ - { - type: ApplicationCommandOptionType.USER, - name: 'user', - description: 'The user to add/remove the role on', - required: true - }, - { - type: ApplicationCommandOptionType.ROLE, - name: 'role', - description: 'The role to add/remove', - required: true - } - ] - }); - } - - public async exec( - message: Message, - { user, role }: { user: GuildMember; role: Role } - ): Promise { - if ( - !message.member.permissions.has('MANAGE_ROLES') && - !this.client.ownerID.includes(message.author.id) - ) { - const mappedRole = this.client.util.moulberryBushRoleMap.find( - (m) => m.id === role.id - ); - if (!mappedRole || !this.roleWhitelist[mappedRole.name]) { - return message.util.reply( - `<:error:837123021016924261> <@&${role.id}> is not whitelisted, and you do not have manage roles permission.`, - { - allowedMentions: AllowedMentions.none() - } - ); - } - const allowedRoles = this.roleWhitelist[mappedRole.name].map((r) => { - return this.client.util.moulberryBushRoleMap.find((m) => m.name === r) - .id; - }); - if ( - !message.member.roles.cache.some((role) => - allowedRoles.includes(role.id) - ) - ) { - return message.util.reply( - `<:error:837123021016924261> <@&${role.id}> is whitelisted, but you do not have any of the roles required to manage it.`, - { - allowedMentions: AllowedMentions.none() - } - ); - } - } - if (!this.client.ownerID.includes(message.author.id)) { - if (role.comparePositionTo(message.member.roles.highest) >= 0) { - return message.util.reply( - `<:error:837123021016924261> <@&${role.id}> is higher or equal to your highest role.`, - { - allowedMentions: AllowedMentions.none() - } - ); - } - if (role.comparePositionTo(message.guild.me.roles.highest) >= 0) { - return message.util.reply( - `<:error:837123021016924261> <@&${role.id}> is higher or equal to my highest role.`, - { - allowedMentions: AllowedMentions.none() - } - ); - } - if (role.managed) { - await message.util.reply( - `<:error:837123021016924261> <@&${role.id}> is managed by an integration and cannot be managed.`, - { - allowedMentions: AllowedMentions.none() - } - ); - } - } - // No checks if the user has MANAGE_ROLES - if (user.roles.cache.has(role.id)) { - try { - await user.roles.remove(role.id); - } catch { - return message.util.reply( - `<:error:837123021016924261> Could not remove <@&${role.id}> from <@${user.id}>.`, - { allowedMentions: AllowedMentions.none() } - ); - } - return message.util.reply( - `<:checkmark:837109864101707807> Successfully removed <@&${role.id}> from <@${user.id}>!`, - { allowedMentions: AllowedMentions.none() } - ); - } else { - try { - await user.roles.add(role.id); - } catch { - return message.util.reply( - `<:error:837123021016924261> Could not add <@&${role.id}> to <@${user.id}>.`, - { allowedMentions: AllowedMentions.none() } - ); - } - return message.util.reply( - `<:checkmark:837109864101707807> Successfully added <@&${role.id}> to <@${user.id}>!`, - { allowedMentions: AllowedMentions.none() } - ); - } - } -} diff --git a/src/commands/moderation/roleCommand.ts b/src/commands/moderation/roleCommand.ts new file mode 100644 index 0000000..04437ba --- /dev/null +++ b/src/commands/moderation/roleCommand.ts @@ -0,0 +1,181 @@ +/* eslint-disable @typescript-eslint/no-empty-function */ +import { BushCommand } from '../../lib/extensions/BushCommand'; +import AllowedMentions from '../../lib/utils/AllowedMentions'; +import { Message, Role, GuildMember } from 'discord.js'; +import { ApplicationCommandOptionType } from 'discord-api-types'; + +export default class RoleCommand extends BushCommand { + private roleWhitelist: Record = { + 'Partner': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], + 'Suggester': [ + '*', + 'Admin Perms', + 'Sr. Moderator', + 'Moderator', + 'Helper', + 'Trial Helper', + 'Contributor' + ], + 'Level Locked': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], + 'No Files': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], + 'No Reactions': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], + 'No Links': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], + 'No Bots': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], + 'No VC': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], + 'No Giveaways': [ + '*', + 'Admin Perms', + 'Sr. Moderator', + 'Moderator', + 'Helper' + ], + 'No Support': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], + 'Giveaway Donor': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], + 'Giveaway (200m)': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], + 'Giveaway (100m)': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], + 'Giveaway (50m)': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], + 'Giveaway (25m)': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], + 'Giveaway (10m)': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], + 'Giveaway (5m)': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'], + 'Giveaway (1m)': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'] + }; + constructor() { + super('role', { + aliases: ['role', 'addrole', 'removerole'], + category: "moderation", + description: { + content: "Manages users' roles.", + usage: 'role ', + examples: ['role add tyman adminperms'] + }, + clientPermissions: ['MANAGE_ROLES', 'EMBED_LINKS', 'SEND_MESSAGES'], + channel: 'guild', + typing: true, + args: [ + { + id: 'user', + type: 'member', + prompt: { + start: `What user do you want to add/remove the role on?`, + retry: `<:error:837123021016924261> Choose a valid user to add/remove the role on.` + } + }, + { + id: 'role', + type: 'role', + match: 'restContent', + prompt: { + start: `What role do you want to add/remove?`, + retry: `<:error:837123021016924261> Choose a valid role to add/remove.` + } + } + ], + slashCommandOptions: [ + { + type: ApplicationCommandOptionType.USER, + name: 'user', + description: 'The user to add/remove the role on', + required: true + }, + { + type: ApplicationCommandOptionType.ROLE, + name: 'role', + description: 'The role to add/remove', + required: true + } + ] + }); + } + + public async exec( + message: Message, + { user, role }: { user: GuildMember; role: Role } + ): Promise { + if ( + !message.member.permissions.has('MANAGE_ROLES') && + !this.client.ownerID.includes(message.author.id) + ) { + const mappedRole = this.client.util.moulberryBushRoleMap.find( + (m) => m.id === role.id + ); + if (!mappedRole || !this.roleWhitelist[mappedRole.name]) { + return message.util.reply( + `<:error:837123021016924261> <@&${role.id}> is not whitelisted, and you do not have manage roles permission.`, + { + allowedMentions: AllowedMentions.none() + } + ); + } + const allowedRoles = this.roleWhitelist[mappedRole.name].map((r) => { + return this.client.util.moulberryBushRoleMap.find((m) => m.name === r) + .id; + }); + if ( + !message.member.roles.cache.some((role) => + allowedRoles.includes(role.id) + ) + ) { + return message.util.reply( + `<:error:837123021016924261> <@&${role.id}> is whitelisted, but you do not have any of the roles required to manage it.`, + { + allowedMentions: AllowedMentions.none() + } + ); + } + } + if (!this.client.ownerID.includes(message.author.id)) { + if (role.comparePositionTo(message.member.roles.highest) >= 0) { + return message.util.reply( + `<:error:837123021016924261> <@&${role.id}> is higher or equal to your highest role.`, + { + allowedMentions: AllowedMentions.none() + } + ); + } + if (role.comparePositionTo(message.guild.me.roles.highest) >= 0) { + return message.util.reply( + `<:error:837123021016924261> <@&${role.id}> is higher or equal to my highest role.`, + { + allowedMentions: AllowedMentions.none() + } + ); + } + if (role.managed) { + await message.util.reply( + `<:error:837123021016924261> <@&${role.id}> is managed by an integration and cannot be managed.`, + { + allowedMentions: AllowedMentions.none() + } + ); + } + } + // No checks if the user has MANAGE_ROLES + if (user.roles.cache.has(role.id)) { + try { + await user.roles.remove(role.id); + } catch { + return message.util.reply( + `<:error:837123021016924261> Could not remove <@&${role.id}> from <@${user.id}>.`, + { allowedMentions: AllowedMentions.none() } + ); + } + return message.util.reply( + `<:checkmark:837109864101707807> Successfully removed <@&${role.id}> from <@${user.id}>!`, + { allowedMentions: AllowedMentions.none() } + ); + } else { + try { + await user.roles.add(role.id); + } catch { + return message.util.reply( + `<:error:837123021016924261> Could not add <@&${role.id}> to <@${user.id}>.`, + { allowedMentions: AllowedMentions.none() } + ); + } + return message.util.reply( + `<:checkmark:837109864101707807> Successfully added <@&${role.id}> to <@${user.id}>!`, + { allowedMentions: AllowedMentions.none() } + ); + } + } +} diff --git a/src/commands/moderation/warn.ts b/src/commands/moderation/warn.ts deleted file mode 100644 index e8b1401..0000000 --- a/src/commands/moderation/warn.ts +++ /dev/null @@ -1,67 +0,0 @@ -import { GuildMember, Message } from 'discord.js'; -import { BushCommand } from '../../lib/extensions/BushCommand'; -import { Guild, Modlog, ModlogType } from '../../lib/models'; - -export default class WarnCommand extends BushCommand { - public constructor() { - super('warn', { - aliases: ['warn'], - userPermissions: ['MANAGE_MESSAGES'], - args: [ - { - id: 'member', - type: 'member' - }, - { - id: 'reason', - match: 'rest' - } - ], - description: { - content: 'Warn a member and log it in modlogs', - usage: 'warn ', - examples: ['warn @Tyman being cool'] - } - }); - } - public async exec( - message: Message, - { member, reason }: { member: GuildMember; reason: string } - ): Promise { - // Create guild entry so postgres doesn't get mad when I try and add a modlog entry - await Guild.findOrCreate({ - where: { - id: message.guild.id - }, - defaults: { - id: message.guild.id - } - }); - try { - const entry = Modlog.build({ - user: member.id, - guild: message.guild.id, - moderator: message.author.id, - type: ModlogType.WARN, - reason - }); - await entry.save(); - } catch (e) { - await message.util.send( - 'Error saving to database, please contact the developers' - ); - return; - } - try { - await member.send( - `You were warned in ${message.guild.name} for reason "${reason}".` - ); - } catch (e) { - await message.util.send('Error messaging user, warning still saved.'); - return; - } - await message.util.send( - `${member.user.tag} was warned for reason "${reason}".` - ); - } -} diff --git a/src/commands/moderation/warnCommand.ts b/src/commands/moderation/warnCommand.ts new file mode 100644 index 0000000..ea2d7ee --- /dev/null +++ b/src/commands/moderation/warnCommand.ts @@ -0,0 +1,68 @@ +import { GuildMember, Message } from 'discord.js'; +import { BushCommand } from '../../lib/extensions/BushCommand'; +import { Guild, Modlog, ModlogType } from '../../lib/models'; + +export default class WarnCommand extends BushCommand { + public constructor() { + super('warn', { + aliases: ['warn'], + category: "moderation", + userPermissions: ['MANAGE_MESSAGES'], + args: [ + { + id: 'member', + type: 'member' + }, + { + id: 'reason', + match: 'rest' + } + ], + description: { + content: 'Warn a member and log it in modlogs', + usage: 'warn ', + examples: ['warn @Tyman being cool'] + } + }); + } + public async exec( + message: Message, + { member, reason }: { member: GuildMember; reason: string } + ): Promise { + // Create guild entry so postgres doesn't get mad when I try and add a modlog entry + await Guild.findOrCreate({ + where: { + id: message.guild.id + }, + defaults: { + id: message.guild.id + } + }); + try { + const entry = Modlog.build({ + user: member.id, + guild: message.guild.id, + moderator: message.author.id, + type: ModlogType.WARN, + reason + }); + await entry.save(); + } catch (e) { + await message.util.send( + 'Error saving to database, please contact the developers' + ); + return; + } + try { + await member.send( + `You were warned in ${message.guild.name} for reason "${reason}".` + ); + } catch (e) { + await message.util.send('Error messaging user, warning still saved.'); + return; + } + await message.util.send( + `${member.user.tag} was warned for reason "${reason}".` + ); + } +} diff --git a/src/commands/moulberry-bush/capePermissionsCommand.ts b/src/commands/moulberry-bush/capePermissionsCommand.ts new file mode 100644 index 0000000..fdb5caf --- /dev/null +++ b/src/commands/moulberry-bush/capePermissionsCommand.ts @@ -0,0 +1,126 @@ +import { ApplicationCommandOptionType } from 'discord-api-types'; +import { MessageEmbed } from 'discord.js'; +import { CommandInteraction } from 'discord.js'; +import { Message } from 'discord.js'; +import got from 'got'; +import { BushCommand } from '../../lib/extensions/BushCommand'; +import { SlashCommandOption } from '../../lib/extensions/Util'; + +interface Capeperms { + success: boolean; + perms: User[]; +} +interface User { + _id: string; + perms: string[]; +} + +export default class CapePermissionsCommand extends BushCommand { + private nameMap = { + patreon1: 'Patreon Tier 1', + patreon2: 'Patreon Tier 2', + fade: 'Fade', + contrib: 'Contributor', + nullzee: 'Nullzee', + gravy: 'ThatGravyBoat', + space: 'Space', + mcworld: 'Minecraft World', + lava: 'Lava', + packshq: 'PacksHQ', + mbstaff: "Moulberry's Bush staff", + thebakery: "Biscuit's Bakery", + negative: 'Negative', + void: 'Void', + ironmoon: 'IRONM00N', + krusty: 'Krusty', + furf: 'FurfSky Reborn', + soldier: 'Soldier', + dsm: "Danker's Skyblock Mod", + zera: 'Zera', + tunnel: 'Tunnel', + alexxoffi: 'Alexxoffi', + parallax: 'Parallax', + jakethybro: 'Jakethybro', + planets: 'Planets' + }; + public constructor() { + super('capeperms', { + aliases: ['capeperms', 'capeperm', 'capepermissions', 'capepermission'], + category: "Moulberry's Bush", + description: { + content: 'A command to see what capes someone has access to.', + usage: 'capeperms ', + examples: ['capeperms IRONM00N'] + }, + args: [ + { + id: 'user', + type: 'string', + prompt: { + start: 'Who would you like to see the cape permissions of?', + retry: + '<:error:837123021016924261> Choose someone to see the capes their available capes.', + optional: false + } + } + ], + clientPermissions: ['EMBED_LINKS', 'SEND_MESSAGES'], + channel: 'guild', + slashCommandOptions: [ + { + type: ApplicationCommandOptionType.STRING, + name: 'user', + description: + 'The username of the player to see the cape permissions of', + required: true + } + ] + }); + } + private async getResponse(user: string): Promise { + let capeperms: Capeperms, uuid: string; + try { + uuid = await this.client.util.mcUUID(user); + } catch (e) { + return `<:error:837123021016924261> \`${user}\` doesn't appear to be a valid username.`; + } + + try { + capeperms = await got + .get('http://moulberry.codes/permscapes.json') + .json(); + } catch (error) { + capeperms = null; + } + if (capeperms == null) { + return `<:error:837123021016924261> There was an error finding cape perms for \`${user}\`.`; + } else { + if (capeperms?.perms) { + const foundUser = capeperms.perms.find((u) => u._id === uuid); + if (foundUser == null) + return `<:error:837123021016924261> \`${user}\` does not appear to have any capes.`; + const userPerm: string[] = foundUser.perms; + const embed = this.client.util + .createEmbed(this.client.util.colors.default) + .setTitle(`${user}'s Capes`) + .setDescription(userPerm.join('\n')); + return embed; + } else { + return `<:error:837123021016924261> There was an error finding cape perms for ${user}.`; + } + } + } + public async exec( + message: Message, + { user }: { user: string } + ): Promise { + await message.reply(await this.getResponse(user)); + } + + public async execSlash( + message: CommandInteraction, + { user }: { user: SlashCommandOption } + ): Promise { + await message.reply(await this.getResponse(user.value)); + } +} diff --git a/src/commands/moulberry-bush/capeperms.ts b/src/commands/moulberry-bush/capeperms.ts deleted file mode 100644 index 9832083..0000000 --- a/src/commands/moulberry-bush/capeperms.ts +++ /dev/null @@ -1,126 +0,0 @@ -import { ApplicationCommandOptionType } from 'discord-api-types'; -import { MessageEmbed } from 'discord.js'; -import { CommandInteraction } from 'discord.js'; -import { Message } from 'discord.js'; -import got from 'got'; -import { BushCommand } from '../../lib/extensions/BushCommand'; -import { SlashCommandOption } from '../../lib/extensions/Util'; - -interface Capeperms { - success: boolean; - perms: User[]; -} -interface User { - _id: string; - perms: string[]; -} - -export default class CapePermsCommand extends BushCommand { - private nameMap = { - patreon1: 'Patreon Tier 1', - patreon2: 'Patreon Tier 2', - fade: 'Fade', - contrib: 'Contributor', - nullzee: 'Nullzee', - gravy: 'ThatGravyBoat', - space: 'Space', - mcworld: 'Minecraft World', - lava: 'Lava', - packshq: 'PacksHQ', - mbstaff: "Moulberry's Bush staff", - thebakery: "Biscuit's Bakery", - negative: 'Negative', - void: 'Void', - ironmoon: 'IRONM00N', - krusty: 'Krusty', - furf: 'FurfSky Reborn', - soldier: 'Soldier', - dsm: "Danker's Skyblock Mod", - zera: 'Zera', - tunnel: 'Tunnel', - alexxoffi: 'Alexxoffi', - parallax: 'Parallax', - jakethybro: 'Jakethybro', - planets: 'Planets' - }; - public constructor() { - super('capeperms', { - aliases: ['capeperms', 'capeperm'], - category: "Moulberry's Bush", - description: { - content: 'A command to see what capes someone has access to.', - usage: 'capeperms ', - examples: ['capeperms IRONM00N'] - }, - args: [ - { - id: 'user', - type: 'string', - prompt: { - start: 'Who would you like to see the cape permissions of?', - retry: - '<:error:837123021016924261> Choose someone to see the capes their available capes.', - optional: false - } - } - ], - clientPermissions: ['EMBED_LINKS', 'SEND_MESSAGES'], - channel: 'guild', - slashCommandOptions: [ - { - type: ApplicationCommandOptionType.STRING, - name: 'user', - description: - 'The username of the player to see the cape permissions of', - required: true - } - ] - }); - } - private async getResponse(user: string): Promise { - let capeperms: Capeperms, uuid: string; - try { - uuid = await this.client.util.mcUUID(user); - } catch (e) { - return `<:error:837123021016924261> \`${user}\` doesn't appear to be a valid username.`; - } - - try { - capeperms = await got - .get('http://moulberry.codes/permscapes.json') - .json(); - } catch (error) { - capeperms = null; - } - if (capeperms == null) { - return `<:error:837123021016924261> There was an error finding cape perms for \`${user}\`.`; - } else { - if (capeperms?.perms) { - const foundUser = capeperms.perms.find((u) => u._id === uuid); - if (foundUser == null) - return `<:error:837123021016924261> \`${user}\` does not appear to have any capes.`; - const userPerm: string[] = foundUser.perms; - const embed = this.client.util - .createEmbed(this.client.util.colors.default) - .setTitle(`${user}'s Capes`) - .setDescription(userPerm.join('\n')); - return embed; - } else { - return `<:error:837123021016924261> There was an error finding cape perms for ${user}.`; - } - } - } - public async exec( - message: Message, - { user }: { user: string } - ): Promise { - await message.reply(await this.getResponse(user)); - } - - public async execSlash( - message: CommandInteraction, - { user }: { user: SlashCommandOption } - ): Promise { - await message.reply(await this.getResponse(user.value)); - } -} diff --git a/src/commands/moulberry-bush/giveawayPingCommand.ts b/src/commands/moulberry-bush/giveawayPingCommand.ts new file mode 100644 index 0000000..e6fdd9a --- /dev/null +++ b/src/commands/moulberry-bush/giveawayPingCommand.ts @@ -0,0 +1,68 @@ +import { BushCommand } from '../../lib/extensions/BushCommand'; +import AllowedMentions from '../../lib/utils/AllowedMentions'; +import { Message, WebhookClient } from 'discord.js'; +import { TextChannel } from 'discord.js'; +import { NewsChannel } from 'discord.js'; + +export default class GiveawayPingCommand extends BushCommand { + constructor() { + super('giveawayping', { + aliases: ['giveawayping', 'giveawaypong'], + category: "Moulberry's Bush", + description: { + content: 'Pings the giveaway role.', + usage: 'giveawayping', + examples: ['giveawayping'] + }, + clientPermissions: ['MANAGE_MESSAGES'], + userPermissions: [ + 'SEND_MESSAGES', + 'MANAGE_GUILD', + 'MANAGE_MESSAGES', + 'BAN_MEMBERS', + 'KICK_MEMBERS', + 'VIEW_CHANNEL' + ], + channel: 'guild', + ignoreCooldown: [], + ignorePermissions: [], + cooldown: 1.44e7, //4 hours + ratelimit: 1, + editable: false + }); + } + public async exec(message: Message): Promise { + if (message.guild.id !== '516977525906341928') + return message.reply( + "<:error:837123021016924261> This command may only be run in Moulberry's Bush." + ); + if ( + !['767782084981817344', '833855738501267456'].includes(message.channel.id) + ) + return message.reply( + '<:error:837123021016924261> This command may only be run in giveaway channels.' + ); + await message.delete().catch(() => undefined); + const webhooks = await ( + message.channel as TextChannel | NewsChannel + ).fetchWebhooks(); + let webhookClient: WebhookClient; + if (webhooks.size < 1) { + const webhook = await ( + message.channel as TextChannel | NewsChannel + ).createWebhook('Giveaway ping webhook'); + webhookClient = new WebhookClient(webhook.id, webhook.token); + } else { + const webhook = webhooks.first(); + webhookClient = new WebhookClient(webhook.id, webhook.token); + } + return webhookClient.send( + '🎉 <@&767782793261875210> Giveaway.\n\n<:mad:783046135392239626> Spamming, line breaking, gibberish etc. disqualifies you from winning. We can and will ban you from giveaways. Winners will all be checked and rerolled if needed.', + { + username: `${message.member.nickname || message.author.username}`, + avatarURL: message.author.avatarURL({ dynamic: true }), + allowedMentions: AllowedMentions.roles() + } + ); + } +} diff --git a/src/commands/moulberry-bush/giveawayping.ts b/src/commands/moulberry-bush/giveawayping.ts deleted file mode 100644 index e6fdd9a..0000000 --- a/src/commands/moulberry-bush/giveawayping.ts +++ /dev/null @@ -1,68 +0,0 @@ -import { BushCommand } from '../../lib/extensions/BushCommand'; -import AllowedMentions from '../../lib/utils/AllowedMentions'; -import { Message, WebhookClient } from 'discord.js'; -import { TextChannel } from 'discord.js'; -import { NewsChannel } from 'discord.js'; - -export default class GiveawayPingCommand extends BushCommand { - constructor() { - super('giveawayping', { - aliases: ['giveawayping', 'giveawaypong'], - category: "Moulberry's Bush", - description: { - content: 'Pings the giveaway role.', - usage: 'giveawayping', - examples: ['giveawayping'] - }, - clientPermissions: ['MANAGE_MESSAGES'], - userPermissions: [ - 'SEND_MESSAGES', - 'MANAGE_GUILD', - 'MANAGE_MESSAGES', - 'BAN_MEMBERS', - 'KICK_MEMBERS', - 'VIEW_CHANNEL' - ], - channel: 'guild', - ignoreCooldown: [], - ignorePermissions: [], - cooldown: 1.44e7, //4 hours - ratelimit: 1, - editable: false - }); - } - public async exec(message: Message): Promise { - if (message.guild.id !== '516977525906341928') - return message.reply( - "<:error:837123021016924261> This command may only be run in Moulberry's Bush." - ); - if ( - !['767782084981817344', '833855738501267456'].includes(message.channel.id) - ) - return message.reply( - '<:error:837123021016924261> This command may only be run in giveaway channels.' - ); - await message.delete().catch(() => undefined); - const webhooks = await ( - message.channel as TextChannel | NewsChannel - ).fetchWebhooks(); - let webhookClient: WebhookClient; - if (webhooks.size < 1) { - const webhook = await ( - message.channel as TextChannel | NewsChannel - ).createWebhook('Giveaway ping webhook'); - webhookClient = new WebhookClient(webhook.id, webhook.token); - } else { - const webhook = webhooks.first(); - webhookClient = new WebhookClient(webhook.id, webhook.token); - } - return webhookClient.send( - '🎉 <@&767782793261875210> Giveaway.\n\n<:mad:783046135392239626> Spamming, line breaking, gibberish etc. disqualifies you from winning. We can and will ban you from giveaways. Winners will all be checked and rerolled if needed.', - { - username: `${message.member.nickname || message.author.username}`, - avatarURL: message.author.avatarURL({ dynamic: true }), - allowedMentions: AllowedMentions.roles() - } - ); - } -} diff --git a/src/commands/moulberry-bush/level.ts b/src/commands/moulberry-bush/level.ts deleted file mode 100644 index decac8a..0000000 --- a/src/commands/moulberry-bush/level.ts +++ /dev/null @@ -1,62 +0,0 @@ -import { ApplicationCommandOptionType } from 'discord-api-types'; -import { Message } from 'discord.js'; -import { CommandInteractionOption } from 'discord.js'; -import { CommandInteraction } from 'discord.js'; -import { User } from 'discord.js'; -import { BushCommand } from '../../lib/extensions/BushCommand'; -import { Level } from '../../lib/models'; - -export default class LevelCommand extends BushCommand { - constructor() { - super('level', { - aliases: ['level', 'rank'], - category: "Moulberry's Bush", - description: { - content: 'Shows the level of a user', - usage: 'level [user]', - examples: ['level', 'level @Tyman'] - }, - args: [ - { - id: 'user', - type: 'user', - prompt: { - start: 'What user would you like to see the level of?', - retry: - 'Invalid user. What user would you like to see the level of?', - optional: true - } - } - ], - slashCommandOptions: [ - { - type: ApplicationCommandOptionType.USER, - name: 'user', - description: 'The user to get the level of', - required: false - } - ] - }); - } - - private async getResponse(user: User): Promise { - const userLevelRow = await Level.findByPk(user.id); - if (userLevelRow) { - return `${user ? `${user.tag}'s` : 'Your'} level is ${ - userLevelRow.level - } (${userLevelRow.xp} XP)`; - } else { - return `${user ? `${user.tag} does` : 'You do'} not have a level yet!`; - } - } - - async exec(message: Message, { user }: { user?: User }): Promise { - await message.reply(await this.getResponse(user || message.author)); - } - async execSlash( - message: CommandInteraction, - { user }: { user?: CommandInteractionOption } - ): Promise { - await message.reply(await this.getResponse(user?.user || message.user)); - } -} diff --git a/src/commands/moulberry-bush/levelCommand.ts b/src/commands/moulberry-bush/levelCommand.ts new file mode 100644 index 0000000..decac8a --- /dev/null +++ b/src/commands/moulberry-bush/levelCommand.ts @@ -0,0 +1,62 @@ +import { ApplicationCommandOptionType } from 'discord-api-types'; +import { Message } from 'discord.js'; +import { CommandInteractionOption } from 'discord.js'; +import { CommandInteraction } from 'discord.js'; +import { User } from 'discord.js'; +import { BushCommand } from '../../lib/extensions/BushCommand'; +import { Level } from '../../lib/models'; + +export default class LevelCommand extends BushCommand { + constructor() { + super('level', { + aliases: ['level', 'rank'], + category: "Moulberry's Bush", + description: { + content: 'Shows the level of a user', + usage: 'level [user]', + examples: ['level', 'level @Tyman'] + }, + args: [ + { + id: 'user', + type: 'user', + prompt: { + start: 'What user would you like to see the level of?', + retry: + 'Invalid user. What user would you like to see the level of?', + optional: true + } + } + ], + slashCommandOptions: [ + { + type: ApplicationCommandOptionType.USER, + name: 'user', + description: 'The user to get the level of', + required: false + } + ] + }); + } + + private async getResponse(user: User): Promise { + const userLevelRow = await Level.findByPk(user.id); + if (userLevelRow) { + return `${user ? `${user.tag}'s` : 'Your'} level is ${ + userLevelRow.level + } (${userLevelRow.xp} XP)`; + } else { + return `${user ? `${user.tag} does` : 'You do'} not have a level yet!`; + } + } + + async exec(message: Message, { user }: { user?: User }): Promise { + await message.reply(await this.getResponse(user || message.author)); + } + async execSlash( + message: CommandInteraction, + { user }: { user?: CommandInteractionOption } + ): Promise { + await message.reply(await this.getResponse(user?.user || message.user)); + } +} diff --git a/src/commands/moulberry-bush/rule.ts b/src/commands/moulberry-bush/rule.ts deleted file mode 100644 index 69dcb6e..0000000 --- a/src/commands/moulberry-bush/rule.ts +++ /dev/null @@ -1,188 +0,0 @@ -import { Argument } from 'discord-akairo'; -import { Message, MessageEmbed, User } from 'discord.js'; -import { BushCommand } from '../../lib/extensions/BushCommand'; -import { ApplicationCommandOptionType } from 'discord-api-types'; -import { CommandInteraction } from 'discord.js'; -import { SlashCommandOption } from '../../lib/extensions/Util'; - -export default class RuleCommand extends BushCommand { - private rules = [ - { - title: "Follow Discord's TOS", - description: - "Be sure to follow discord's TOS found at , you must be 13 to use discord so if you admit to being under 13 you will be banned from the server." - }, - { - title: 'Be Respectful', - description: - 'Racist, sexist, homophobic, xenophobic, transphobic, ableist, hate speech, slurs, or any other derogatory, toxic, or discriminatory behavior will not be tolerated.' - }, - { - title: 'No Spamming', - description: - 'Including but not limited to: any messages that do not contribute to the conversation, repeated messages, randomly tagging users, and chat flood.' - }, - { - title: 'English', - description: - 'The primary language of the server is English, please keep all discussions in English.' - }, - { - title: 'Safe for Work', - description: - 'Please keep NSFW and NSFL content out of this server, avoid borderline images as well as keeping your status and profile picture SFW.' - }, - { - title: 'No Advertising', - description: - 'Do not promote anything without prior approval from a staff member, this includes DM advertising.' - }, - { - title: 'Impersonation', - description: - 'Do not try to impersonate others for the express intent of being deceitful, defamation , and/or personal gain.' - }, - { - title: 'Swearing', - description: 'Swearing is allowed only when not used as an insult.' - }, - { - title: 'Only ping @emergency in emergencies', - description: - 'Pinging <@&833802660209229854> for no reason will result in severe punishment. <@&833802660209229854> is only to be pinged in true emergencies.' - }, - { - title: 'No Backseat Moderating', - description: - 'If you see a rule being broken be broken, please report it using: `-report [evidence]`.' - }, - { - title: 'Staff may moderate at their discretion', - description: - 'If there are loopholes in our rules, the staff team may moderate based on what they deem appropriate. The staff team holds final discretion.' - }, - { - title: "Sending media that are able to crash a user's Discord", - description: - "Sending videos, GIFs, emojis, etc. that are able to crash someone's discord will result in a **permanent** mute that cannot be appealed." - } - ]; - - public constructor() { - super('rule', { - aliases: ['rule', 'rules'], - category: "Moulberry's Bush", - description: { - content: 'A command to state a rule.', - usage: 'rule [user]', - examples: ['rule 1 IRONM00N', 'rule 2', 'rules'] - }, - args: [ - { - id: 'rule', - type: Argument.range('number', 1, 12, true), - prompt: { - start: 'What rule would you like to have cited?', - retry: '<:no:787549684196704257> Choose a valid rule.', - optional: true - }, - default: undefined - }, - { - id: 'user', - type: 'user', - prompt: { - start: 'What user would you like to mention?', - retry: '<:no:787549684196704257> Choose a valid user to mention.', - optional: true - }, - default: undefined - } - ], - clientPermissions: ['EMBED_LINKS', 'SEND_MESSAGES'], - channel: 'guild', - slashCommandOptions: [ - { - type: ApplicationCommandOptionType.INTEGER, - name: 'rule', - description: 'The rule to show', - required: false - }, - { - type: ApplicationCommandOptionType.USER, - name: 'user', - description: 'The user to ping', - required: false - } - ] - }); - } - private getResponse( - message: Message | CommandInteraction, - rule?: number, - user?: User - ): string | MessageEmbed | [string, MessageEmbed] { - if ( - message.guild.id !== '516977525906341928' && - !this.client.ownerID.includes( - message instanceof Message ? message.author.id : message.user.id - ) - ) { - return "<:no:787549684196704257> This command can only be run in Moulberry's Bush."; - } - let rulesEmbed = new MessageEmbed().setColor('ef3929'); - if (message instanceof Message) { - rulesEmbed = rulesEmbed.setFooter( - `Triggered by ${message.author.tag}`, - message.author.avatarURL({ dynamic: true }) - ); - } - if (rule) { - const foundRule = this.rules[rule - 1]; - rulesEmbed.addField(`${rule}) ${foundRule.title}`, foundRule.description); - } else { - for (const curRule of this.rules) { - rulesEmbed.addField( - `${this.rules.indexOf(curRule) + 1}) ${curRule.title}`, - curRule.description - ); - } - } - if (!user) { - return rulesEmbed; - } else { - return [`<@!${user.id}>`, rulesEmbed]; - } - } - public async exec( - message: Message, - { rule, user }: { rule?: number; user?: User } - ): Promise { - const response = this.getResponse(message, rule, user); - if (Array.isArray(response)) { - await message.util.send(response[0], { - embed: response[1] - }); - } else { - await message.util.send(response); - } - await message.delete().catch(() => undefined); - } - - public async execSlash( - message: CommandInteraction, - { - rule, - user - }: { rule?: SlashCommandOption; user?: SlashCommandOption } - ): Promise { - const response = this.getResponse(message, rule?.value, user?.user); - if (Array.isArray(response)) { - await message.reply(response[0], { - embeds: [response[1]] - }); - } else { - await message.reply(response); - } - } -} diff --git a/src/commands/moulberry-bush/ruleCommand.ts b/src/commands/moulberry-bush/ruleCommand.ts new file mode 100644 index 0000000..69dcb6e --- /dev/null +++ b/src/commands/moulberry-bush/ruleCommand.ts @@ -0,0 +1,188 @@ +import { Argument } from 'discord-akairo'; +import { Message, MessageEmbed, User } from 'discord.js'; +import { BushCommand } from '../../lib/extensions/BushCommand'; +import { ApplicationCommandOptionType } from 'discord-api-types'; +import { CommandInteraction } from 'discord.js'; +import { SlashCommandOption } from '../../lib/extensions/Util'; + +export default class RuleCommand extends BushCommand { + private rules = [ + { + title: "Follow Discord's TOS", + description: + "Be sure to follow discord's TOS found at , you must be 13 to use discord so if you admit to being under 13 you will be banned from the server." + }, + { + title: 'Be Respectful', + description: + 'Racist, sexist, homophobic, xenophobic, transphobic, ableist, hate speech, slurs, or any other derogatory, toxic, or discriminatory behavior will not be tolerated.' + }, + { + title: 'No Spamming', + description: + 'Including but not limited to: any messages that do not contribute to the conversation, repeated messages, randomly tagging users, and chat flood.' + }, + { + title: 'English', + description: + 'The primary language of the server is English, please keep all discussions in English.' + }, + { + title: 'Safe for Work', + description: + 'Please keep NSFW and NSFL content out of this server, avoid borderline images as well as keeping your status and profile picture SFW.' + }, + { + title: 'No Advertising', + description: + 'Do not promote anything without prior approval from a staff member, this includes DM advertising.' + }, + { + title: 'Impersonation', + description: + 'Do not try to impersonate others for the express intent of being deceitful, defamation , and/or personal gain.' + }, + { + title: 'Swearing', + description: 'Swearing is allowed only when not used as an insult.' + }, + { + title: 'Only ping @emergency in emergencies', + description: + 'Pinging <@&833802660209229854> for no reason will result in severe punishment. <@&833802660209229854> is only to be pinged in true emergencies.' + }, + { + title: 'No Backseat Moderating', + description: + 'If you see a rule being broken be broken, please report it using: `-report [evidence]`.' + }, + { + title: 'Staff may moderate at their discretion', + description: + 'If there are loopholes in our rules, the staff team may moderate based on what they deem appropriate. The staff team holds final discretion.' + }, + { + title: "Sending media that are able to crash a user's Discord", + description: + "Sending videos, GIFs, emojis, etc. that are able to crash someone's discord will result in a **permanent** mute that cannot be appealed." + } + ]; + + public constructor() { + super('rule', { + aliases: ['rule', 'rules'], + category: "Moulberry's Bush", + description: { + content: 'A command to state a rule.', + usage: 'rule [user]', + examples: ['rule 1 IRONM00N', 'rule 2', 'rules'] + }, + args: [ + { + id: 'rule', + type: Argument.range('number', 1, 12, true), + prompt: { + start: 'What rule would you like to have cited?', + retry: '<:no:787549684196704257> Choose a valid rule.', + optional: true + }, + default: undefined + }, + { + id: 'user', + type: 'user', + prompt: { + start: 'What user would you like to mention?', + retry: '<:no:787549684196704257> Choose a valid user to mention.', + optional: true + }, + default: undefined + } + ], + clientPermissions: ['EMBED_LINKS', 'SEND_MESSAGES'], + channel: 'guild', + slashCommandOptions: [ + { + type: ApplicationCommandOptionType.INTEGER, + name: 'rule', + description: 'The rule to show', + required: false + }, + { + type: ApplicationCommandOptionType.USER, + name: 'user', + description: 'The user to ping', + required: false + } + ] + }); + } + private getResponse( + message: Message | CommandInteraction, + rule?: number, + user?: User + ): string | MessageEmbed | [string, MessageEmbed] { + if ( + message.guild.id !== '516977525906341928' && + !this.client.ownerID.includes( + message instanceof Message ? message.author.id : message.user.id + ) + ) { + return "<:no:787549684196704257> This command can only be run in Moulberry's Bush."; + } + let rulesEmbed = new MessageEmbed().setColor('ef3929'); + if (message instanceof Message) { + rulesEmbed = rulesEmbed.setFooter( + `Triggered by ${message.author.tag}`, + message.author.avatarURL({ dynamic: true }) + ); + } + if (rule) { + const foundRule = this.rules[rule - 1]; + rulesEmbed.addField(`${rule}) ${foundRule.title}`, foundRule.description); + } else { + for (const curRule of this.rules) { + rulesEmbed.addField( + `${this.rules.indexOf(curRule) + 1}) ${curRule.title}`, + curRule.description + ); + } + } + if (!user) { + return rulesEmbed; + } else { + return [`<@!${user.id}>`, rulesEmbed]; + } + } + public async exec( + message: Message, + { rule, user }: { rule?: number; user?: User } + ): Promise { + const response = this.getResponse(message, rule, user); + if (Array.isArray(response)) { + await message.util.send(response[0], { + embed: response[1] + }); + } else { + await message.util.send(response); + } + await message.delete().catch(() => undefined); + } + + public async execSlash( + message: CommandInteraction, + { + rule, + user + }: { rule?: SlashCommandOption; user?: SlashCommandOption } + ): Promise { + const response = this.getResponse(message, rule?.value, user?.user); + if (Array.isArray(response)) { + await message.reply(response[0], { + embeds: [response[1]] + }); + } else { + await message.reply(response); + } + } +} diff --git a/src/commands/server-config/prefix.ts b/src/commands/server-config/prefix.ts deleted file mode 100644 index ac85922..0000000 --- a/src/commands/server-config/prefix.ts +++ /dev/null @@ -1,71 +0,0 @@ -import { ApplicationCommandOptionType } from 'discord-api-types'; -import { CommandInteraction, Message, Guild as DiscordGuild } from 'discord.js'; -import { BushCommand } from '../../lib/extensions/BushCommand'; -import { SlashCommandOption } from '../../lib/extensions/Util'; -import { Guild } from '../../lib/models'; - -export default class PrefixCommand extends BushCommand { - constructor() { - super('prefix', { - aliases: ['prefix'], - category: "server config", - args: [ - { - id: 'prefix' - } - ], - userPermissions: ['MANAGE_GUILD'], - description: { - content: - 'Set the prefix of the current server (resets to default if prefix is not given)', - usage: 'prefix [prefix]', - examples: ['prefix', 'prefix +'] - }, - slashCommandOptions: [ - { - type: ApplicationCommandOptionType.STRING, - name: 'prefix', - description: 'The prefix to set for this server', - required: false - } - ] - }); - } - - async changePrefix(guild: DiscordGuild, prefix?: string): Promise { - if (prefix) { - const row = await Guild.findByPk(guild.id); - row.prefix = prefix; - await row.save(); - } else { - const row = await Guild.findByPk(guild.id); - row.prefix = this.client.config.prefix; - await row.save(); - } - } - - async exec(message: Message, { prefix }: { prefix?: string }): Promise { - await this.changePrefix(message.guild, prefix); - if (prefix) { - await message.util.send(`Sucessfully set prefix to \`${prefix}\``); - } else { - await message.util.send( - `Sucessfully reset prefix to \`${this.client.config.prefix}\`` - ); - } - } - - async execSlash( - message: CommandInteraction, - { prefix }: { prefix?: SlashCommandOption } - ): Promise { - await this.changePrefix(message.guild, prefix?.value); - if (prefix) { - await message.reply(`Sucessfully set prefix to \`${prefix.value}\``); - } else { - await message.reply( - `Sucessfully reset prefix to \`${this.client.config.prefix}\`` - ); - } - } -} diff --git a/src/commands/server-config/prefixCommand.ts b/src/commands/server-config/prefixCommand.ts new file mode 100644 index 0000000..ac85922 --- /dev/null +++ b/src/commands/server-config/prefixCommand.ts @@ -0,0 +1,71 @@ +import { ApplicationCommandOptionType } from 'discord-api-types'; +import { CommandInteraction, Message, Guild as DiscordGuild } from 'discord.js'; +import { BushCommand } from '../../lib/extensions/BushCommand'; +import { SlashCommandOption } from '../../lib/extensions/Util'; +import { Guild } from '../../lib/models'; + +export default class PrefixCommand extends BushCommand { + constructor() { + super('prefix', { + aliases: ['prefix'], + category: "server config", + args: [ + { + id: 'prefix' + } + ], + userPermissions: ['MANAGE_GUILD'], + description: { + content: + 'Set the prefix of the current server (resets to default if prefix is not given)', + usage: 'prefix [prefix]', + examples: ['prefix', 'prefix +'] + }, + slashCommandOptions: [ + { + type: ApplicationCommandOptionType.STRING, + name: 'prefix', + description: 'The prefix to set for this server', + required: false + } + ] + }); + } + + async changePrefix(guild: DiscordGuild, prefix?: string): Promise { + if (prefix) { + const row = await Guild.findByPk(guild.id); + row.prefix = prefix; + await row.save(); + } else { + const row = await Guild.findByPk(guild.id); + row.prefix = this.client.config.prefix; + await row.save(); + } + } + + async exec(message: Message, { prefix }: { prefix?: string }): Promise { + await this.changePrefix(message.guild, prefix); + if (prefix) { + await message.util.send(`Sucessfully set prefix to \`${prefix}\``); + } else { + await message.util.send( + `Sucessfully reset prefix to \`${this.client.config.prefix}\`` + ); + } + } + + async execSlash( + message: CommandInteraction, + { prefix }: { prefix?: SlashCommandOption } + ): Promise { + await this.changePrefix(message.guild, prefix?.value); + if (prefix) { + await message.reply(`Sucessfully set prefix to \`${prefix.value}\``); + } else { + await message.reply( + `Sucessfully reset prefix to \`${this.client.config.prefix}\`` + ); + } + } +} diff --git a/src/listeners/client/ready.ts b/src/listeners/client/ready.ts deleted file mode 100644 index b13dd36..0000000 --- a/src/listeners/client/ready.ts +++ /dev/null @@ -1,18 +0,0 @@ -import chalk from 'chalk'; -import { BushListener } from '../../lib/extensions/BushListener'; - -export default class CommandBlockedListener extends BushListener { - public constructor() { - super('ready', { - emitter: 'client', - event: 'ready' - }); - } - - public async exec(): Promise { - await this.client.logger.log( - chalk`{green Sucessfully logged in as {cyan ${this.client.user.tag}}.}`, - true - ); - } -} diff --git a/src/listeners/client/readyListener.ts b/src/listeners/client/readyListener.ts new file mode 100644 index 0000000..8d4ac6a --- /dev/null +++ b/src/listeners/client/readyListener.ts @@ -0,0 +1,18 @@ +import chalk from 'chalk'; +import { BushListener } from '../../lib/extensions/BushListener'; + +export default class ReadyListener extends BushListener { + public constructor() { + super('ready', { + emitter: 'client', + event: 'ready' + }); + } + + public async exec(): Promise { + await this.client.logger.log( + chalk`{green Sucessfully logged in as {cyan ${this.client.user.tag}}.}`, + true + ); + } +} diff --git a/src/listeners/client/syncSlashCommandsListener.ts b/src/listeners/client/syncSlashCommandsListener.ts new file mode 100644 index 0000000..7835136 --- /dev/null +++ b/src/listeners/client/syncSlashCommandsListener.ts @@ -0,0 +1,22 @@ +import { BushListener } from '../../lib/extensions/BushListener'; + +export default class SyncSlashCommandsListener extends BushListener { + constructor() { + super('syncslashcommands', { + emitter: 'client', + event: 'ready' + }); + } + async exec(): Promise { + if (this.client.config.dev && this.client.config.devGuild) { + // Use guild slash commands for instant registration in dev + await this.client.util.syncSlashCommands( + false, + this.client.config.devGuild + ); + } else { + // Use global in production + await this.client.util.syncSlashCommands(); + } + } +} diff --git a/src/listeners/client/syncslashcommands.ts b/src/listeners/client/syncslashcommands.ts deleted file mode 100644 index d734507..0000000 --- a/src/listeners/client/syncslashcommands.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { BushListener } from '../../lib/extensions/BushListener'; - -export default class CreateSlashCommands extends BushListener { - constructor() { - super('createslashcommands', { - emitter: 'client', - event: 'ready' - }); - } - async exec(): Promise { - if (this.client.config.dev && this.client.config.devGuild) { - // Use guild slash commands for instant registration in dev - await this.client.util.syncSlashCommands( - false, - this.client.config.devGuild - ); - } else { - // Use global in production - await this.client.util.syncSlashCommands(); - } - } -} diff --git a/src/listeners/commands/commandBlockedListener.ts b/src/listeners/commands/commandBlockedListener.ts new file mode 100644 index 0000000..dee1319 --- /dev/null +++ b/src/listeners/commands/commandBlockedListener.ts @@ -0,0 +1,34 @@ +import { BushListener } from '../../lib/extensions/BushListener'; +import { Command } from 'discord-akairo'; +import { Message } from 'discord.js'; + +export default class CommandBlockedListener extends BushListener { + public constructor() { + super('commandBlocked', { + emitter: 'commandHandler', + event: 'commandBlocked' + }); + } + + public async exec( + message: Message, + command: Command, + reason: string + ): Promise { + switch (reason) { + case 'owner': { + await message.util.send( + `You must be an owner to run command \`${message.util.parsed.command}\`` + ); + break; + } + case 'blacklist': { + // pass + break; + } + default: { + await message.util.send(`Command blocked with reason \`${reason}\``); + } + } + } +} diff --git a/src/listeners/commands/commandErrorListener.ts b/src/listeners/commands/commandErrorListener.ts new file mode 100644 index 0000000..518545a --- /dev/null +++ b/src/listeners/commands/commandErrorListener.ts @@ -0,0 +1,48 @@ +import { BushCommand } from '../../lib/extensions/BushCommand'; +import { BushListener } from '../../lib/extensions/BushListener'; +import { stripIndents } from 'common-tags'; +import { Message } from 'discord.js'; +import { MessageEmbed } from 'discord.js'; +import { TextChannel } from 'discord.js'; + +export default class CommandErrorListener extends BushListener { + constructor() { + super('error', { + emitter: 'commandHandler', + event: 'error' + }); + } + async exec( + error: Error, + message: Message, + command?: BushCommand + ): Promise { + const errorNumber = Math.floor(Math.random() * 6969696969) + 69; // hehe funy numbers + const errorDevEmbed = this.client.util + .createEmbed(this.client.util.colors.error) + .setTitle(`Error # \`${errorNumber}\`: An error occurred`) + .setDescription( + stripIndents`**User:** ${message.author} (${message.author.tag}) + **Command:** ${command} + **Channel:** ${message.channel} (${message.channel.id}) + **Message:** [link](${message.url})` + ) + .addField('Error', `${await this.client.util.haste(error.stack)}`); + let errorUserEmbed: MessageEmbed; + if (command) { + errorUserEmbed = this.client.util + .createEmbed(this.client.util.colors.error) + .setTitle('An error occurred') + .setDescription( + stripIndents`Whoops! It appears like something broke. + The developers have been notified of this. If you contact them, give them code \`${errorNumber}\`. + ` + ); + } + const channel = (await this.client.channels.fetch( + this.client.config.channels.log + )) as TextChannel; + await channel.send(errorDevEmbed); + if (errorUserEmbed) await message.reply(errorUserEmbed); + } +} diff --git a/src/listeners/commands/commandStartedListener.ts b/src/listeners/commands/commandStartedListener.ts new file mode 100644 index 0000000..d81ed59 --- /dev/null +++ b/src/listeners/commands/commandStartedListener.ts @@ -0,0 +1,24 @@ +import chalk from 'chalk'; +import { Message, DMChannel } from 'discord.js'; +import { BushCommand } from '../../lib/extensions/BushCommand'; +import { BushListener } from '../../lib/extensions/BushListener'; + +export default class CommandStartedListener extends BushListener { + constructor() { + super('logCommands', { + emitter: 'commandHandler', + event: 'commandStarted' + }); + } + exec(message: Message, command: BushCommand): void { + this.client.logger.verbose( + chalk`{cyan {green ${message.author.tag}} is running {green ${ + command.aliases[0] + }} in {green ${ + message.channel instanceof DMChannel + ? 'DMs' + : `#${message.channel.name} (Server: ${message.guild.name})` + }}.}` + ); + } +} diff --git a/src/listeners/commands/commandblocked.ts b/src/listeners/commands/commandblocked.ts deleted file mode 100644 index dee1319..0000000 --- a/src/listeners/commands/commandblocked.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { BushListener } from '../../lib/extensions/BushListener'; -import { Command } from 'discord-akairo'; -import { Message } from 'discord.js'; - -export default class CommandBlockedListener extends BushListener { - public constructor() { - super('commandBlocked', { - emitter: 'commandHandler', - event: 'commandBlocked' - }); - } - - public async exec( - message: Message, - command: Command, - reason: string - ): Promise { - switch (reason) { - case 'owner': { - await message.util.send( - `You must be an owner to run command \`${message.util.parsed.command}\`` - ); - break; - } - case 'blacklist': { - // pass - break; - } - default: { - await message.util.send(`Command blocked with reason \`${reason}\``); - } - } - } -} diff --git a/src/listeners/commands/commandstarted.ts b/src/listeners/commands/commandstarted.ts deleted file mode 100644 index d81ed59..0000000 --- a/src/listeners/commands/commandstarted.ts +++ /dev/null @@ -1,24 +0,0 @@ -import chalk from 'chalk'; -import { Message, DMChannel } from 'discord.js'; -import { BushCommand } from '../../lib/extensions/BushCommand'; -import { BushListener } from '../../lib/extensions/BushListener'; - -export default class CommandStartedListener extends BushListener { - constructor() { - super('logCommands', { - emitter: 'commandHandler', - event: 'commandStarted' - }); - } - exec(message: Message, command: BushCommand): void { - this.client.logger.verbose( - chalk`{cyan {green ${message.author.tag}} is running {green ${ - command.aliases[0] - }} in {green ${ - message.channel instanceof DMChannel - ? 'DMs' - : `#${message.channel.name} (Server: ${message.guild.name})` - }}.}` - ); - } -} diff --git a/src/listeners/commands/error.ts b/src/listeners/commands/error.ts deleted file mode 100644 index 518545a..0000000 --- a/src/listeners/commands/error.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { BushCommand } from '../../lib/extensions/BushCommand'; -import { BushListener } from '../../lib/extensions/BushListener'; -import { stripIndents } from 'common-tags'; -import { Message } from 'discord.js'; -import { MessageEmbed } from 'discord.js'; -import { TextChannel } from 'discord.js'; - -export default class CommandErrorListener extends BushListener { - constructor() { - super('error', { - emitter: 'commandHandler', - event: 'error' - }); - } - async exec( - error: Error, - message: Message, - command?: BushCommand - ): Promise { - const errorNumber = Math.floor(Math.random() * 6969696969) + 69; // hehe funy numbers - const errorDevEmbed = this.client.util - .createEmbed(this.client.util.colors.error) - .setTitle(`Error # \`${errorNumber}\`: An error occurred`) - .setDescription( - stripIndents`**User:** ${message.author} (${message.author.tag}) - **Command:** ${command} - **Channel:** ${message.channel} (${message.channel.id}) - **Message:** [link](${message.url})` - ) - .addField('Error', `${await this.client.util.haste(error.stack)}`); - let errorUserEmbed: MessageEmbed; - if (command) { - errorUserEmbed = this.client.util - .createEmbed(this.client.util.colors.error) - .setTitle('An error occurred') - .setDescription( - stripIndents`Whoops! It appears like something broke. - The developers have been notified of this. If you contact them, give them code \`${errorNumber}\`. - ` - ); - } - const channel = (await this.client.channels.fetch( - this.client.config.channels.log - )) as TextChannel; - await channel.send(errorDevEmbed); - if (errorUserEmbed) await message.reply(errorUserEmbed); - } -} diff --git a/src/listeners/commands/slashCommandErrorListener.ts b/src/listeners/commands/slashCommandErrorListener.ts new file mode 100644 index 0000000..a2b7bb7 --- /dev/null +++ b/src/listeners/commands/slashCommandErrorListener.ts @@ -0,0 +1,48 @@ +import { BushCommand } from '../../lib/extensions/BushCommand'; +import { BushListener } from '../../lib/extensions/BushListener'; +import { stripIndents } from 'common-tags'; +import { MessageEmbed } from 'discord.js'; +import { TextChannel } from 'discord.js'; +import { CommandInteraction } from 'discord.js'; + +export default class SlashCommandErrorListener extends BushListener { + constructor() { + super('slashError', { + emitter: 'commandHandler', + event: 'slashError' + }); + } + async exec( + error: Error, + message: CommandInteraction, + command: BushCommand + ): Promise { + const errorNumber = Math.floor(Math.random() * 6969696969) + 69; // hehe funy numbers + const errorDevEmbed = this.client.util + .createEmbed(this.client.util.colors.error) + .setTitle(`Slash Error # \`${errorNumber}\`: An error occurred`) + .setDescription( + stripIndents`**User:** <@${message.user.id}> (${message.user.tag}) + **Slash Command:** ${command} + **Channel:** <#${message.channelID}> (${message.channelID}) + **Message:** [link](https://discord.com/${message.guildID}/${message.channelID}/${message.id})` + ) + .addField('Error', `${await this.client.util.haste(error.stack)}`); + let errorUserEmbed: MessageEmbed; + if (command) { + errorUserEmbed = this.client.util + .createEmbed(this.client.util.colors.error) + .setTitle('An error occurred') + .setDescription( + stripIndents`Whoops! It appears like something broke. + The developers have been notified of this. If you contact them, give them code \`${errorNumber}\`. + ` + ); + } + const channel = (await this.client.channels.fetch( + this.client.config.channels.log + )) as TextChannel; + await channel.send(errorDevEmbed); + if (errorUserEmbed) await message.reply(errorUserEmbed); + } +} diff --git a/src/listeners/commands/slashError.ts b/src/listeners/commands/slashError.ts deleted file mode 100644 index 3f2260d..0000000 --- a/src/listeners/commands/slashError.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { BushCommand } from '../../lib/extensions/BushCommand'; -import { BushListener } from '../../lib/extensions/BushListener'; -import { stripIndents } from 'common-tags'; -import { MessageEmbed } from 'discord.js'; -import { TextChannel } from 'discord.js'; -import { CommandInteraction } from 'discord.js'; - -export default class CommandErrorListener extends BushListener { - constructor() { - super('slashError', { - emitter: 'commandHandler', - event: 'slashError' - }); - } - async exec( - error: Error, - message: CommandInteraction, - command: BushCommand - ): Promise { - const errorNumber = Math.floor(Math.random() * 6969696969) + 69; // hehe funy numbers - const errorDevEmbed = this.client.util - .createEmbed(this.client.util.colors.error) - .setTitle(`Slash Error # \`${errorNumber}\`: An error occurred`) - .setDescription( - stripIndents`**User:** <@${message.user.id}> (${message.user.tag}) - **Slash Command:** ${command} - **Channel:** <#${message.channelID}> (${message.channelID}) - **Message:** [link](https://discord.com/${message.guildID}/${message.channelID}/${message.id})` - ) - .addField('Error', `${await this.client.util.haste(error.stack)}`); - let errorUserEmbed: MessageEmbed; - if (command) { - errorUserEmbed = this.client.util - .createEmbed(this.client.util.colors.error) - .setTitle('An error occurred') - .setDescription( - stripIndents`Whoops! It appears like something broke. - The developers have been notified of this. If you contact them, give them code \`${errorNumber}\`. - ` - ); - } - const channel = (await this.client.channels.fetch( - this.client.config.channels.log - )) as TextChannel; - await channel.send(errorDevEmbed); - if (errorUserEmbed) await message.reply(errorUserEmbed); - } -} diff --git a/src/listeners/guild/syncUnbanListener.ts b/src/listeners/guild/syncUnbanListener.ts new file mode 100644 index 0000000..81a08f8 --- /dev/null +++ b/src/listeners/guild/syncUnbanListener.ts @@ -0,0 +1,24 @@ +import { User, Guild } from 'discord.js'; +import { BushListener } from '../../lib/extensions/BushListener'; +import { Ban } from '../../lib/models'; + +export default class SyncUnbanListener extends BushListener { + public constructor() { + super('guildBanRemove', { + emitter: 'client', + event: 'guildBanRemove' + }); + } + + public async exec(guild: Guild, user: User): Promise { + const bans = await Ban.findAll({ + where: { + user: user.id, + guild: guild.id + } + }); + for (const dbBan of bans) { + await dbBan.destroy(); + } + } +} diff --git a/src/listeners/guild/syncunban.ts b/src/listeners/guild/syncunban.ts deleted file mode 100644 index b8a1419..0000000 --- a/src/listeners/guild/syncunban.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { User, Guild } from 'discord.js'; -import { BushListener } from '../../lib/extensions/BushListener'; -import { Ban } from '../../lib/models'; - -export default class CommandBlockedListener extends BushListener { - public constructor() { - super('guildBanRemove', { - emitter: 'client', - event: 'guildBanRemove' - }); - } - - public async exec(guild: Guild, user: User): Promise { - const bans = await Ban.findAll({ - where: { - user: user.id, - guild: guild.id - } - }); - for (const dbBan of bans) { - await dbBan.destroy(); - } - } -} diff --git a/src/listeners/message/levelListener.ts b/src/listeners/message/levelListener.ts new file mode 100644 index 0000000..3b23f36 --- /dev/null +++ b/src/listeners/message/levelListener.ts @@ -0,0 +1,40 @@ +import chalk from 'chalk'; +import { Message } from 'discord.js'; +import { BushListener } from '../../lib/extensions/BushListener'; +import { Level } from '../../lib/models'; + +export default class LevelListener extends BushListener { + private levelCooldowns: Set = new Set(); + private blacklistedChannels = ['702456294874808330']; + constructor() { + super('level', { + emitter: 'commandHandler', + event: 'messageInvalid' // Using messageInvalid here so commands don't give xp + }); + } + async exec(message: Message): Promise { + if (message.author.bot) return; + if (message.util?.parsed?.command) return; + if (this.levelCooldowns.has(message.author.id)) return; + if (!this.client.config.dev && message.guild.id != '516977525906341928') + return; + if (this.blacklistedChannels.includes(message.channel.id)) return; + if (!['DEFAULT', 'REPLY'].includes(message.type)) return; //checks for join messages, slash commands, booster messages etc + const [user] = await Level.findOrBuild({ + where: { + id: message.author.id + }, + defaults: { + id: message.author.id + } + }); + const xpToGive = Level.genRandomizedXp(); + user.xp += xpToGive; + await user.save(); + await this.client.logger.verbose( + chalk`{cyan Gave XP to {green ${message.author.tag}}: {green ${xpToGive}xp}.}` + ); + this.levelCooldowns.add(message.author.id); + setTimeout(() => this.levelCooldowns.delete(message.author.id), 60_000); + } +} diff --git a/src/listeners/message/levels.ts b/src/listeners/message/levels.ts deleted file mode 100644 index 3503584..0000000 --- a/src/listeners/message/levels.ts +++ /dev/null @@ -1,39 +0,0 @@ -import chalk from 'chalk'; -import { Message } from 'discord.js'; -import { BushListener } from '../../lib/extensions/BushListener'; -import { Level } from '../../lib/models'; - -export default class LevelListener extends BushListener { - private levelCooldowns: Set = new Set(); - private blacklistedChannels = ['702456294874808330']; - constructor() { - super('level', { - emitter: 'commandHandler', - event: 'messageInvalid' // Using messageInvalid here so commands don't give xp - }); - } - async exec(message: Message): Promise { - if (message.author.bot) return; - if (message.util?.parsed?.command) return; - if (this.levelCooldowns.has(message.author.id)) return; - if (!this.client.config.dev && message.guild.id != '516977525906341928') - return; - if (this.blacklistedChannels.includes(message.channel.id)) return; - const [user] = await Level.findOrBuild({ - where: { - id: message.author.id - }, - defaults: { - id: message.author.id - } - }); - const xpToGive = Level.genRandomizedXp(); - user.xp += xpToGive; - await user.save(); - await this.client.logger.verbose( - chalk`{cyan Gave XP to {green ${message.author.tag}}: {green ${xpToGive}xp}.}` - ); - this.levelCooldowns.add(message.author.id); - setTimeout(() => this.levelCooldowns.delete(message.author.id), 60_000); - } -} diff --git a/src/tasks/Unban.ts b/src/tasks/Unban.ts deleted file mode 100644 index 6b9d82e..0000000 --- a/src/tasks/Unban.ts +++ /dev/null @@ -1,49 +0,0 @@ -import chalk from 'chalk'; -import { DiscordAPIError } from 'discord.js'; -import { Op } from 'sequelize'; -import { BushTask } from '../lib/extensions/BushTask'; -import { Ban } from '../lib/models'; - -export default class UnbanTask extends BushTask { - constructor() { - super('unban', { - delay: 30_000, // 1/2 min - runOnStart: true - }); - } - async exec(): Promise { - const rows = await Ban.findAll({ - where: { - [Op.and]: [ - { - expires: { - [Op.lt]: new Date() // Find all rows with an expiry date before now - } - } - ] - } - }); - this.client.logger.verbose( - chalk.cyan(`Queried bans, found ${rows.length} expired bans.`) - ); - for (const row of rows) { - const guild = this.client.guilds.cache.get(row.guild); - if (!guild) { - await row.destroy(); - continue; - } - try { - await guild.members.unban( - row.user, - `Unbanning user because tempban expired` - ); - } catch (e) { - if (e instanceof DiscordAPIError) { - // Member not banned, ignore - } else throw e; - } - await row.destroy(); - this.client.logger.verbose(chalk.cyan('Unbanned user')); - } - } -} diff --git a/src/tasks/UnbanTask.ts b/src/tasks/UnbanTask.ts new file mode 100644 index 0000000..6b9d82e --- /dev/null +++ b/src/tasks/UnbanTask.ts @@ -0,0 +1,49 @@ +import chalk from 'chalk'; +import { DiscordAPIError } from 'discord.js'; +import { Op } from 'sequelize'; +import { BushTask } from '../lib/extensions/BushTask'; +import { Ban } from '../lib/models'; + +export default class UnbanTask extends BushTask { + constructor() { + super('unban', { + delay: 30_000, // 1/2 min + runOnStart: true + }); + } + async exec(): Promise { + const rows = await Ban.findAll({ + where: { + [Op.and]: [ + { + expires: { + [Op.lt]: new Date() // Find all rows with an expiry date before now + } + } + ] + } + }); + this.client.logger.verbose( + chalk.cyan(`Queried bans, found ${rows.length} expired bans.`) + ); + for (const row of rows) { + const guild = this.client.guilds.cache.get(row.guild); + if (!guild) { + await row.destroy(); + continue; + } + try { + await guild.members.unban( + row.user, + `Unbanning user because tempban expired` + ); + } catch (e) { + if (e instanceof DiscordAPIError) { + // Member not banned, ignore + } else throw e; + } + await row.destroy(); + this.client.logger.verbose(chalk.cyan('Unbanned user')); + } + } +} -- cgit