From b5793611d57a734d75b6a0845c441f33d144a5c0 Mon Sep 17 00:00:00 2001 From: IRONM00N <64110067+IRONM00N@users.noreply.github.com> Date: Wed, 4 Aug 2021 19:32:39 -0400 Subject: misc --- package.json | 11 +- src/commands/dev/__template.ts | 2 - src/commands/dev/_testDB.ts | 25 --- src/commands/dev/_testDuration.ts | 53 ----- src/commands/moderation/_lockdown.ts | 1 + src/commands/moderation/ban.ts | 3 +- src/commands/moderation/evidence.ts | 60 +++++ src/commands/moderation/kick.ts | 2 +- src/commands/moderation/modlog.ts | 12 +- src/commands/moderation/mute.ts | 1 + src/commands/moderation/purge.ts | 70 ++++++ src/commands/moderation/unban.ts | 2 +- src/commands/moderation/unmute.ts | 3 +- src/commands/moderation/warn.ts | 1 + src/commands/moulberry-bush/level.ts | 2 +- src/commands/utilities/hash.ts | 2 +- src/commands/utilities/youtube.ts | 59 +++++ src/lib/badlinks.json | 242 ++++++++++++--------- src/lib/extensions/discord-akairo/BushClient.ts | 14 +- .../extensions/discord-akairo/BushClientUtil.ts | 31 ++- .../discord.js/BushApplicationCommand.ts | 2 +- src/lib/extensions/discord.js/BushChannel.d.ts | 7 +- src/lib/extensions/discord.js/BushGuildMember.ts | 205 ++++++++--------- src/lib/models/ActivePunishment.ts | 32 +-- src/lib/models/BaseModel.ts | 6 +- src/lib/models/Global.ts | 28 +-- src/lib/models/Guild.ts | 50 +++-- src/lib/models/Level.ts | 19 +- src/lib/models/ModLog.ts | 50 +++-- src/lib/models/StickyRole.ts | 17 +- src/lib/utils/BushCache.ts | 16 +- src/lib/utils/BushConstants.ts | 41 ++-- src/lib/utils/BushLogger.ts | 85 ++++---- src/listeners/message/blacklistedFile.ts | 8 +- src/listeners/message/level.ts | 12 +- src/tasks/updateCache.ts | 6 +- tsconfig.json | 4 +- yarn.lock | 241 +++++++++++++------- 38 files changed, 836 insertions(+), 589 deletions(-) delete mode 100644 src/commands/dev/_testDB.ts delete mode 100644 src/commands/dev/_testDuration.ts create mode 100644 src/commands/moderation/evidence.ts create mode 100644 src/commands/moderation/purge.ts create mode 100644 src/commands/utilities/youtube.ts diff --git a/package.json b/package.json index fa9376c..26a87fe 100644 --- a/package.json +++ b/package.json @@ -55,6 +55,7 @@ "chalk": "^4.1.1", "common-tags": "^1.8.0", "discord-akairo": "NotEnoughUpdates/discord-akairo", + "discord-akairo-message-util": "NotEnoughUpdates/discord-akairo-message-util", "discord-api-types": "0.21.0", "discord.js": "NotEnoughUpdates/discord.js", "discord.js-minesweeper": "^1.0.6", @@ -129,5 +130,13 @@ "singleQuote": true, "trailingComma": "none" }, - "packageManager": "yarn@3.0.0" + "packageManager": "yarn@3.0.0", + "dependenciesMeta": { + "discord-akairo@8.2.2": { + "unplugged": true + }, + "discord-akairo-message-util@1.0.0": { + "unplugged": true + } + } } diff --git a/src/commands/dev/__template.ts b/src/commands/dev/__template.ts index 949e04e..be4f7a7 100644 --- a/src/commands/dev/__template.ts +++ b/src/commands/dev/__template.ts @@ -14,7 +14,6 @@ export default class TemplateCommand extends BushCommand { { id: 'required_argument', type: 'string', - prompt: { start: 'What would you like to set your first argument to be?', retry: '{error} Pick a valid argument.', @@ -24,7 +23,6 @@ export default class TemplateCommand extends BushCommand { { id: 'optional_argument', type: 'string', - prompt: { start: 'What would you like to set your second argument to be?', retry: '{error} Pick a valid argument.', diff --git a/src/commands/dev/_testDB.ts b/src/commands/dev/_testDB.ts deleted file mode 100644 index e1fddb4..0000000 --- a/src/commands/dev/_testDB.ts +++ /dev/null @@ -1,25 +0,0 @@ -// import { BushCommand, BushSlashMessage, Global } from '@lib'; -// import { Message } from 'discord.js'; -// import { inspect } from 'util'; - -// export default class TestDurationCommand extends BushCommand { -// public constructor() { -// super('db', { -// aliases: ['db'], -// category: 'dev', -// description: { -// content: '', -// usage: '', -// examples: [''] -// }, -// slash: false, -// hidden: true, -// ownerOnly: true, -// completelyHide: true -// }); -// } - -// override async exec(message: Message | BushSlashMessage): Promise { -// return await message.util.reply(await util.codeblock(inspect((await Global.findOne()).environment), 2000, 'js')); -// } -// } diff --git a/src/commands/dev/_testDuration.ts b/src/commands/dev/_testDuration.ts deleted file mode 100644 index 0591518..0000000 --- a/src/commands/dev/_testDuration.ts +++ /dev/null @@ -1,53 +0,0 @@ -// import { BushCommand, BushSlashMessage } from '@lib'; -// import { stripIndents } from 'common-tags'; -// import { Message } from 'discord.js'; - -// export default class TestDurationCommand extends BushCommand { -// public constructor() { -// super('testduration', { -// aliases: ['testduration'], -// category: 'dev', -// description: { -// content: 'Tests duration parsing.', -// usage: 'testduration [reason]', -// examples: ['testduration'] -// }, -// args: [ -// { -// id: 'reason', -// type: 'contentWithDuration', -// match: 'rest', -// prompt: { -// start: 'Enter text and a duration here.', -// retry: '{error} Error parsing duration and text.', -// optional: true -// } -// } -// ], -// slash: true, -// slashOptions: [ -// { -// name: 'reason', -// description: 'Enter text and a duration here.', -// type: 'STRING', -// required: false -// } -// ], -// hidden: true, -// ownerOnly: true -// }); -// } - -// async exec( -// message: Message | BushSlashMessage, -// { reason }: { reason?: { duration: number; contentWithoutTime: string } } -// ): Promise { -// const rawDuration = reason.duration; -// const text = reason.contentWithoutTime; -// const humanizedDuration = util.humanizeDuration(rawDuration); -// return await message.util.reply(stripIndents` -// **rawDuration:** ${rawDuration} -// **text:** ${text} -// **humanizedDuration:** ${humanizedDuration}`); -// } -// } diff --git a/src/commands/moderation/_lockdown.ts b/src/commands/moderation/_lockdown.ts index 374e8f1..32dbd5b 100644 --- a/src/commands/moderation/_lockdown.ts +++ b/src/commands/moderation/_lockdown.ts @@ -31,6 +31,7 @@ export default class LockdownCommand extends BushCommand { userPermissions: ['SEND_MESSAGES'] }); } + public override async exec(message: BushMessage | BushSlashMessage, { all }: { all: boolean }): Promise { return await message.util.reply('no'); if (!all) { diff --git a/src/commands/moderation/ban.ts b/src/commands/moderation/ban.ts index cfa3e31..bda0e2b 100644 --- a/src/commands/moderation/ban.ts +++ b/src/commands/moderation/ban.ts @@ -80,7 +80,8 @@ export default class BanCommand extends BushCommand { userPermissions: ['BAN_MEMBERS'] }); } - override async exec( + + public override async exec( message: BushMessage | BushSlashMessage, { user, diff --git a/src/commands/moderation/evidence.ts b/src/commands/moderation/evidence.ts new file mode 100644 index 0000000..96c3944 --- /dev/null +++ b/src/commands/moderation/evidence.ts @@ -0,0 +1,60 @@ +import { BushCommand, BushMessage, BushSlashMessage } from '@lib'; + +export default class EvidenceCommand extends BushCommand { + public constructor() { + super('evidence', { + aliases: ['evidence'], + category: 'moderation', + description: { + content: 'Add evidence to a modlog case.', + usage: 'evidence ', + examples: ['evidence '] + }, + args: [ + { + id: 'required_argument', + type: 'string', + prompt: { + start: 'What would you like to set your first argument to be?', + retry: '{error} Pick a valid argument.', + optional: false + } + }, + { + id: 'optional_argument', + type: 'string', + prompt: { + start: 'What would you like to set your second argument to be?', + retry: '{error} Pick a valid argument.', + optional: true + } + } + ], + slash: true, + slashOptions: [ + { + name: 'required_argument', + description: 'What would you like to set your first argument to be?', + type: 'STRING', + required: true + }, + { + name: 'optional_argument', + description: 'What would you like to set your second argument to be?', + type: 'STRING', + required: false + } + ], + superUserOnly: true, + ownerOnly: true, + channel: 'guild', + hidden: true, + clientPermissions: ['SEND_MESSAGES'], + userPermissions: ['SEND_MESSAGES'] + }); + } + + public override async exec(message: BushMessage | BushSlashMessage): Promise { + return await message.util.reply(`${util.emojis.error} Do not use the template command.`); + } +} diff --git a/src/commands/moderation/kick.ts b/src/commands/moderation/kick.ts index c425124..2fc133e 100644 --- a/src/commands/moderation/kick.ts +++ b/src/commands/moderation/kick.ts @@ -55,7 +55,7 @@ export default class KickCommand extends BushCommand { }); } - override async exec( + public override async exec( message: BushMessage | BushSlashMessage, { user, reason, force }: { user: BushUser; reason?: string; force: boolean } ): Promise { diff --git a/src/commands/moderation/modlog.ts b/src/commands/moderation/modlog.ts index 8f727a5..84bb5b5 100644 --- a/src/commands/moderation/modlog.ts +++ b/src/commands/moderation/modlog.ts @@ -34,7 +34,7 @@ export default class ModlogCommand extends BushCommand { }); } - private generateModlogInfo(log: ModLog) { + #generateModlogInfo(log: ModLog): string { const modLog = [ `**Case ID**: ${log.id}`, `**Type**: ${log.type.toLowerCase()}`, @@ -43,10 +43,14 @@ export default class ModlogCommand extends BushCommand { ]; if (log.duration) modLog.push(`**Duration**: ${util.humanizeDuration(log.duration)}`); modLog.push(`**Reason**: ${log.reason || 'No Reason Specified.'}`); + if (log.evidence) modLog.push(`**Evidence:** ${log.evidence}`); return modLog.join(`\n`); } - override async exec(message: BushMessage | BushSlashMessage, { search }: { search: BushUser | string }): Promise { + public override async exec( + message: BushMessage | BushSlashMessage, + { search }: { search: BushUser | string } + ): Promise { const foundUser = search instanceof User ? search : await util.resolveUserAsync(search); if (foundUser) { const logs = await ModLog.findAll({ @@ -59,7 +63,7 @@ export default class ModlogCommand extends BushCommand { if (!logs.length) return message.util.reply(`${util.emojis.error} **${foundUser.tag}** does not have any modlogs.`); const niceLogs: string[] = []; for (const log of logs) { - niceLogs.push(this.generateModlogInfo(log)); + niceLogs.push(this.#generateModlogInfo(log)); } const chunked: string[][] = util.chunk(niceLogs, 3); const embedPages = chunked.map( @@ -76,7 +80,7 @@ export default class ModlogCommand extends BushCommand { if (!entry) return message.util.send(`${util.emojis.error} That modlog does not exist.`); const embed = new MessageEmbed({ title: `Case ${entry.id}`, - description: this.generateModlogInfo(entry), + description: this.#generateModlogInfo(entry), color: util.colors.default }); return await util.buttonPaginate(message, [embed]); diff --git a/src/commands/moderation/mute.ts b/src/commands/moderation/mute.ts index df8e235..9f66558 100644 --- a/src/commands/moderation/mute.ts +++ b/src/commands/moderation/mute.ts @@ -56,6 +56,7 @@ export default class MuteCommand extends BushCommand { userPermissions: ['MANAGE_MESSAGES'] }); } + public override async exec( message: BushMessage | BushSlashMessage, { user, reason, force }: { user: BushUser; reason?: { duration: number; contentWithoutTime: string }; force: boolean } diff --git a/src/commands/moderation/purge.ts b/src/commands/moderation/purge.ts new file mode 100644 index 0000000..f4a53a8 --- /dev/null +++ b/src/commands/moderation/purge.ts @@ -0,0 +1,70 @@ +import { BushCommand, BushMessage } from '../../lib'; + +export default class PurgeCommand extends BushCommand { + public constructor() { + super('purge', { + aliases: ['purge'], + category: 'moderation', + description: { + content: 'A command to mass delete messages.', + usage: 'purge ', + examples: ['Purge 20'] + }, + args: [ + { + id: 'amount', + customType: util.arg.range('integer', 1, 100, true), + prompt: { + start: 'How many messages would you like to purge?', + retry: '{error} Please pick a number between 1 and 100.' + } + }, + { + id: 'bot', + match: 'flag', + flag: '--bot' + }, + { id: 'user', match: 'option', flag: '--user' } + ], + slash: true, + slashOptions: [ + { name: 'amount', description: 'How many messages would you like to purge?', type: 'INTEGER', required: true }, + { + name: 'bot', + description: 'Would you like to only delete messages that are from bots?', + type: 'BOOLEAN', + required: false + } + ], + clientPermissions: ['MANAGE_MESSAGES', 'SEND_MESSAGES', 'EMBED_LINKS'], + userPermissions: ['MANAGE_MESSAGES'], + channel: 'guild' + }); + } + + public override async exec(message: BushMessage, args: { amount: number; bot: boolean }): Promise { + if (message.channel.type === 'DM') return message.util.reply(`${util.emojis.error} You cannot run this command in dms.`); + if (args.amount > 100 || args.amount < 1) return message.util.reply(`${util.emojis.error} `); + + const messages = (await message.channel.messages.fetch({ limit: args.amount })).filter((message) => filter(message)); + const filter = (filterMessage: BushMessage): boolean => { + const shouldFilter = new Array(); + if (args.bot) { + shouldFilter.push(filterMessage.author.bot); + } + }; + + const purged = await message.channel.bulkDelete(messages, true).catch(() => {}); + if (!purged) return message.util.reply(`${util.emojis.error} Failed to purge messages.`).catch(() => {}); + else { + await message.util + .send(`${util.emojis.success} Successfully purged **${purged.size}** messages.`) + .then(async (purgeMessage: BushMessage) => { + if (!message.util.isSlash) { + await util.sleep(5); + await purgeMessage.delete().catch(() => {}); + } + }); + } + } +} diff --git a/src/commands/moderation/unban.ts b/src/commands/moderation/unban.ts index 522c715..545d75c 100644 --- a/src/commands/moderation/unban.ts +++ b/src/commands/moderation/unban.ts @@ -51,7 +51,7 @@ export default class UnbanCommand extends BushCommand { userPermissions: ['BAN_MEMBERS'] }); } - override async exec( + public override async exec( message: BushMessage | BushSlashMessage, { user, reason }: { user: BushUser; reason?: string } ): Promise { diff --git a/src/commands/moderation/unmute.ts b/src/commands/moderation/unmute.ts index 6cdb08b..918c27f 100644 --- a/src/commands/moderation/unmute.ts +++ b/src/commands/moderation/unmute.ts @@ -50,7 +50,8 @@ export default class UnmuteCommand extends BushCommand { userPermissions: ['MANAGE_MESSAGES'] }); } - override async exec( + + public override async exec( message: BushMessage | BushSlashMessage, { user, reason }: { user: BushUser; reason?: string } ): Promise { diff --git a/src/commands/moderation/warn.ts b/src/commands/moderation/warn.ts index 1067033..1aa14c3 100644 --- a/src/commands/moderation/warn.ts +++ b/src/commands/moderation/warn.ts @@ -54,6 +54,7 @@ export default class WarnCommand extends BushCommand { userPermissions: ['MANAGE_MESSAGES'] }); } + public override async exec( message: BushMessage | BushSlashMessage, { user, reason, force }: { user: BushUser; reason: string; force: boolean } diff --git a/src/commands/moulberry-bush/level.ts b/src/commands/moulberry-bush/level.ts index fef4538..c202863 100644 --- a/src/commands/moulberry-bush/level.ts +++ b/src/commands/moulberry-bush/level.ts @@ -136,7 +136,7 @@ export default class LevelCommand extends BushCommand { } } - override async exec(message: BushMessage | BushSlashMessage, { user }: { user?: BushUser }): Promise { + public override async exec(message: BushMessage | BushSlashMessage, { user }: { user?: BushUser }): Promise { // await message.reply( // new MessageAttachment( // await this.getImage(user || message.author), diff --git a/src/commands/utilities/hash.ts b/src/commands/utilities/hash.ts index 633a263..16ace93 100644 --- a/src/commands/utilities/hash.ts +++ b/src/commands/utilities/hash.ts @@ -3,7 +3,7 @@ import got from 'got'; import { BushCommand, BushMessage } from '../../lib'; export default class HashCommand extends BushCommand { - constructor() { + public constructor() { super('hash', { aliases: ['hash'], category: 'utilities', diff --git a/src/commands/utilities/youtube.ts b/src/commands/utilities/youtube.ts new file mode 100644 index 0000000..0198173 --- /dev/null +++ b/src/commands/utilities/youtube.ts @@ -0,0 +1,59 @@ +import { VoiceChannel } from 'discord.js'; +import { BushCommand, BushMessage, BushSlashMessage } from '../../lib'; + +export default class YouTubeCommand extends BushCommand { + constructor() { + super('youtube', { + aliases: ['youtube', 'yt'], + category: 'utilities', + description: { + content: "Allows the user to have access to discord's in-app YouTube experiment.", + usage: 'yt ', + examples: ['yt 785281831788216364'] + }, + args: [ + { + id: 'channel', + type: 'voiceChannel', + prompt: { + start: 'What channel would you like to use?', + retry: '{error} Choose a valid voice channel' + } + } + ], + slash: true, + slashOptions: [ + { + name: 'channel', + description: 'What channel would you like to use?', + type: 'CHANNEL', + required: true + } + ], + clientPermissions: ['SEND_MESSAGES'], + userPermissions: ['SEND_MESSAGES'] + }); + } + + public override async exec(message: BushMessage | BushSlashMessage, args: { channel: VoiceChannel }): Promise { + if (!args.channel?.id || args.channel?.type != 'GUILD_VOICE') + return await message.util.reply(`${util.emojis.error} Choose a valid voice channel`); + + // @ts-ignore: jank typings + // prettier-ignore + const invite = await this.client.api.channels(args.channel.id).invites.post({ + data: { + validate: null, + max_age: 604800, + max_uses: 0, + target_type: 2, + target_application_id: '755600276941176913', + temporary: false + } + }) + .catch(() => {}); + if (!invite || !invite.code) + return await message.util.reply(`${this.client.util.emojis.error} An error occurred while generating your invite.`); + else return await message.util.send(`https://discord.gg/${invite.code}`); + } +} diff --git a/src/lib/badlinks.json b/src/lib/badlinks.json index 09c3df2..fa5c29c 100644 --- a/src/lib/badlinks.json +++ b/src/lib/badlinks.json @@ -1,70 +1,25 @@ [ - "streammcomunnity.ru", - "stceamcomminity.com", - "steamcommnuninty.com", - "steamcommnunily.com", - "steamncommuniity.com", - "steamcommuniiy.ru", - "steamcomnumity.ru", - "steamoemmunity.com", - "streancommunuty.ru", - "streamcommuninnity.com", - "streamcomnumity.ru", - "stemcommunnilty.com", - "steamsupportpowered.icu", - "staemcomrnunity.store", - "steam-trades.icu", - "facecup.fun", - "fatown.net", - "ultracup.fun", - "iemcup.com", - "esea-mdl.com", - "uspringcup.com", - "denforapasi.cf", - "streamcommulinty.com", - "csskill.com", - "csgo-gifts.com", - "eplcups.com", - "tf2market.store", - "gamerich.xyz", - "anomalygiveaways.pro", - "casefire.fun", - "fineleague.fun", - "stearmcommunnitty.online", - "stearncomminuty.ru", - "stiemcommunitty.ru", - "strearmcommunity.ru", - "steancomunnity.ru", - "cloud9team.space", - "streancommunuty.ru", - "strearmcomunity.ru", - "stermccommunitty.ru", - "steamcommunytu.ru", - "streamcomunity.com", - "steamncommunity.com", - "steamcommunily.uno", "acercup.com", - "xgamercup.com", - "lootxmarket.com", - "roll4tune.com", - "fivetown.net", - "giveavvay.com", - "stermcommuniity.com", - "skinxinfo.net", - "bit-skins.ru", + "affix-cup.ru", + "affix-sport.ru", + "airdrops.tips", "aladdinhub.fun", "allskinz.xyz", "ano-skinspin.xyz", + "anomalygiveaways.pro", "anomalyknifes.xyz", "anomalyskin.xyz", "anomalyskinz.xyz", "anoskinzz.xyz", "berrygamble.com", + "bit-skins.ru", "bitknife.xyz", "bitskines.ru", - "challengeme.vip", + "casefire.fun", "challengeme.in", + "challengeme.vip", "challengme.ru", + "cloud9team.space", "cmepure.com", "cmskillcup.com", "counterpaid.xyz", @@ -85,21 +40,31 @@ "cscoat.eu", "csgo-analyst.com", "csgo-cash.eu", + "csgo-gifts.com", + "csgo-market.ru.com", + "csgo-market.ru.com", "csgo-steamanalyst.net", "csgo-swapskin.com", "csgo-trade.net", "csgo-up.com", "csgobeats.com", + "csgobelieve.ru", "csgocase.one", "csgocashs.com", + "csgocheck.ru.com", "csgocheck.ru", "csgocompetive.com", + "csgocupp.ru.com", + "csgocybersport.ru.com", "csgodetails.info", "csgodreamer.com", "csgodrs.com", + "csgoeasywin.ru.com", "csgoelite.xyz", "csgoencup.com", "csgoevent.xyz", + "csgogift49.xyz", + "csgoindex.ru.com", "csgoindex.ru", "csgoitemdetails.com", "csgoitemsprices.com", @@ -107,6 +72,7 @@ "csgomarble.xyz", "csgomarketplace.net", "csgomarkets.net", + "csgoorun.ru", "csgoprocupgo.com", "csgorcup.com", "csgorose.com", @@ -127,6 +93,7 @@ "csmoneyskinz.xyz", "csmvcecup.com", "csprices.in", + "csskill.com", "csskillpro.xyz", "csskinz.xyz", "cstournament.ru", @@ -136,30 +103,57 @@ "d2faceit.com", "deamonbets.ru", "demonbets.ru", + "denforapasi.cf", "diablobets.com", + "dicsord.gifts", + "discod.gift", + "discord-gifts.com", + "discord-nitro.gifts", + "discord.blog", + "discord.shop", + "discordgivenitro.com", + "discrod.gift", + "disrcod.com", + "dlscord.info", + "dlscord.online", + "dlscord.press", + "dlscord.store", + "dlscord.world", "doatgiveaway.top", "dopeskins.com", - "dota2fight.ru", "dota2fight.net", + "dota2fight.ru", "dota2giveaway.top", "dota2giveaways.top", "dotafights.vip", "dotagiveaway.win", + "dragon-up.online", "earnskinz.xyz", "emeraldbets.ru", + "eplcups.com", + "esea-mdl.com", "esportgaming.ru", "event-games4roll.com", "exchangeuritems.gq", "extraskinscs.xyz", "ezwin24.ru", + "facecup.fun", "faceiteasyleague.ru", + "fatown.net", + "fineleague.fun", "fireopencase.com", + "fivetown.net", "free-skins.ru", + "g2-give.ru", + "g2-give.ru", "game4roll.com", "gameluck.ru", - "games-roll.ru", - "games-roll.ml", + "gamerich.xyz", "games-roll.ga", + "games-roll.ml", + "games-roll.ru", + "gift4keys.com", + "giveavvay.com", "giveawayskin.com", "global-skins.gq", "globalcsskins.xyz", @@ -169,16 +163,20 @@ "gosteamanalyst.com", "gtakey.ru", "hellgiveaway.trade", + "hellstores.xyz", "hltvcsgo.com", "hltvgames.net", + "iemcup.com", + "keys-loot.com", "knifespin.top", - "knifespin.xyz", "knifespin.top", + "knifespin.xyz", "knifespins.xyz", "knifez-roll.xyz", "knifez-win.xyz", "league-csgo.com", "lehatop-01.ru", + "lootxmarket.com", "loungeztrade.com", "lucky-skins.xyz", "makson-gta.ru", @@ -187,25 +185,25 @@ "mvpcup.ru", "mvptournament.com", "mygames4roll.com", + "naviback.ru", "night-skins.com", + "nitros-gift.com", + "nwgwroqr.ru", "ownerbets.com", "playerskinz.xyz", + "pubggift62.xyz", "rangskins.com", + "rave-new.ru", "roll-skins.ru", "roll4knife.xyz", + "roll4tune.com", "rollknfez.xyz", "rollskin-simple.xyz", - "csgo-market.ru.com", - "sakuralive.ru.com", - "csgocupp.ru.com", - "csgoeasywin.ru.com", - "csgocybersport.ru.com", - "csgocheck.ru.com", - "csgo-market.ru.com", - "csgoindex.ru.com", "rushbskins.xyz", "rushskins.xyz", "s1mple-spin.xyz", + "sakuralive.ru.com", + "scale-navi.pp.ru", "simple-knifez.xyz", "simple-win.xyz", "simplegamepro.ru", @@ -214,8 +212,8 @@ "simplewinz.xyz", "skin-index.com", "skin888trade.com", - "skincs-spin.xyz", "skincs-spin.top", + "skincs-spin.xyz", "skinmarkets.net", "skins-hub.top", "skins-info.net", @@ -228,6 +226,7 @@ "skinsplane.com", "skinsplanes.com", "skinsplanets.com", + "skinxinfo.net", "skinxmarket.site", "skinz-spin.top", "skinz-spin.xyz", @@ -235,71 +234,102 @@ "skinzprize.xyz", "skinzspin-cs.xyz", "skinzspinz.xyz", + "sleanmconmunltiy.ru", "spin-games.com", "spin4skinzcs.top", "spin4skinzcs.xyz", "spinforskin.ml", "sponsored-simple.xyz", + "staemcomnrnunitiy.ru.com", + "staemcomrnunity.store", + "staermcrommunity.me", "staffstatsgo.com", "starrygamble.com", "stat-csgo.ru", "stats-cs.ru", + "stceamcomminity.com", "steam-analyst.ru", + "steam-trades.icu", "steamanalysts.com", + "steamcomcunity.ru", + "steamcomminutiu.ru", + "steamcomminutiy.ru", + "steamcomminytiu.com", + "steamcomminytiu.ru", + "steamcomminytu.ru", + "steamcommnunily.com", + "steamcommnuninty.com", + "steamcommnuntiy.com", + "steamcommrutiny.ru", + "steamcommuniiy.ru", + "steamcommunily.uno", + "steamcommunityu.com", + "steamcommunityw.com", + "steamcommunlty.pro", + "steamcommunutiy.com", + "steamcommunytiu.ru", + "steamcommunytu.ru", + "steamcommutiny.com", + "steamcommynitu.ru", + "steamcomnmuituy.com", + "steamcomnumity.ru", + "steamcomrnunity.ru", + "steamcomrrnunity.com", + "steamcomrunity.com", + "steamconmunlty.com", + "steamcormmuntiy.com", "steamgamesroll.ru", + "steamncommuniity.com", + "steamncommunity.com", + "steamnmcomunnity.co", + "steamoemmunity.com", + "steamsupportpowered.icu", + "steancommynity.ru.com", + "steancomnunytu.ru", + "steancomunnity.ru", + "steancomunyiti.ru", + "stearmcommunnitty.online", + "stearmmcomunitty.ru", + "stearmmcomunity.ru", + "stearmmcomuunity.ru", + "stearncomminuty.ru", + "stearncommunity.ru", + "stearncommunytiy.ru", + "stearncormmunity.com", + "steemcommnunity.ru", + "stemcommunnilty.com", + "stermccommunitty.ru", + "stermcommuniity.com", "stewie2k-giveaway-150days.pro", + "stiemcommunitty.ru", + "store-stempowered.com", + "streamcommulinty.com", + "streamcommuninnity.com", + "streamcommuunnity.com", + "streamcomnumity.ru", + "streamcomunity.com", + "streammcomunnity.ru", + "streancommunuty.ru", + "streancommunuty.ru", + "strearmcommunity.ru", + "strearmcomunity.ru", "sunnygamble.com", "swapskins.live", "test-domuin2.com", "test-domuin3.ru", "test-domuin4.ru", "test-domuin5.ru", + "tf2market.store", "tournamentt.com", - "waterbets.ru", "ultimateskins.xyz", + "ultracup.fun", + "uspringcup.com", + "waterbets.ru", "win-skin.top", "win-skin.xyz", "winknifespin.xyz", "winskin-simple.xyz", "winskins.top", "wintheskin.xyz", - "steemcommnunity.ru", - "steamcomminytu.ru", - "stearncommunity.ru", - "stearncommunytiy.ru", - "steamcommutiny.com", - "steamcomrunity.com", - "steamcommunytiu.ru", - "steamcommnuntiy.com", - "steamcomminytiu.ru", - "steamcomminytiu.com", - "steancomunyiti.ru", - "steamcormmuntiy.com", - "store-stempowered.com", - "dlscord.store", - "streamcommuunnity.com", - "steamcommunityw.com", - "steamconmunlty.com", - "steamcommrutiny.ru", - "dlscord.info", - "steamcomnmuituy.com", - "steamcommunityu.com", - "dicsord.gifts", - "discod.gift", - "discord-nitro.gifts", - "steamcomrrnunity.com", - "stearmmcomunity.ru", - "stearmmcomunitty.ru", - "steamcomminutiu.ru", - "steamcommunlty.pro", - "discord.shop", - "discord.blog", - "steamcomminutiy.ru", - "airdrops.tips", - "steamnmcomunnity.co", - "discrod.gift", - "steancomnunytu.ru", - "discord-gifts.com", - "steamcommunutiy.com", - "dlscord.online" + "xgamercup.com" ] diff --git a/src/lib/extensions/discord-akairo/BushClient.ts b/src/lib/extensions/discord-akairo/BushClient.ts index 4c2b940..8de630f 100644 --- a/src/lib/extensions/discord-akairo/BushClient.ts +++ b/src/lib/extensions/discord-akairo/BushClient.ts @@ -9,6 +9,7 @@ import { MessageEditOptions, MessageOptions, MessagePayload, + PartialDMChannel, ReplyMessageOptions, Snowflake, Structures, @@ -83,6 +84,7 @@ export type BushThreadChannelResolvable = BushThreadChannel | Snowflake; export type BushApplicationCommandResolvable = BushApplicationCommand | Snowflake; export type BushGuildTextChannelResolvable = BushTextChannel | BushNewsChannel | Snowflake; export type BushChannelResolvable = BushChannel | Snowflake; +export type BushTextBasedChannels = PartialDMChannel | BushDMChannel | BushTextChannel | BushNewsChannel | BushThreadChannel; export interface BushFetchedThreads { threads: Collection; hasMore?: boolean; @@ -96,7 +98,7 @@ const rl = readline.createInterface({ type If = T extends true ? A : T extends false ? B : A | B; -export class BushClient extends AkairoClient { +export class BushClient extends AkairoClient { public static preStart(): void { Structures.extend('GuildEmoji', () => BushGuildEmoji); Structures.extend('DMChannel', () => BushDMChannel); @@ -134,7 +136,7 @@ export class BushClient extends AkairoClient { public declare util: BushClientUtil; public declare ownerID: Snowflake[]; public db: Sequelize; - public logger: BushLogger; + public logger = BushLogger; public constants = BushConstants; public cache = BushCache; public constructor(config: Config) { @@ -156,7 +158,6 @@ export class BushClient extends AkairoClient { this.token = config.token; this.config = config; - // Create listener handler this.listenerHandler = new BushListenerHandler(this, { directory: path.join(__dirname, '..', '..', '..', 'listeners'), @@ -216,10 +217,9 @@ export class BushClient extends AkairoClient { port: this.config.db.port, logging: this.config.logging.db ? (sql) => this.logger.debug(sql) : false }); - this.logger = new BushLogger(this); } - get console(): BushLogger { + get console(): typeof BushLogger { return this.logger; } @@ -228,7 +228,7 @@ export class BushClient extends AkairoClient { } // Initialize everything - private async _init(): Promise { + async #init(): Promise { this.commandHandler.useListenerHandler(this.listenerHandler); this.commandHandler.useInhibitorHandler(this.inhibitorHandler); this.commandHandler.ignorePermissions = this.config.owners; @@ -296,7 +296,7 @@ export class BushClient extends AkairoClient { global.util = this.util; try { - await this._init(); + await this.#init(); await this.login(this.token); } catch (e) { await this.console.error('Start', chalk.red(e?.stack || e), false); diff --git a/src/lib/extensions/discord-akairo/BushClientUtil.ts b/src/lib/extensions/discord-akairo/BushClientUtil.ts index af64624..42d3d13 100644 --- a/src/lib/extensions/discord-akairo/BushClientUtil.ts +++ b/src/lib/extensions/discord-akairo/BushClientUtil.ts @@ -102,7 +102,7 @@ export class BushClientUtil extends ClientUtil { /** The client of this ClientUtil */ public declare readonly client: BushClient; /** The hastebin urls used to post to hastebin, attempts to post in order */ - public hasteURLs: string[] = [ + #hasteURLs: string[] = [ 'https://hst.sh', 'https://hasteb.in', 'https://hastebin.com', @@ -112,7 +112,7 @@ export class BushClientUtil extends ClientUtil { 'https://haste.unbelievaboat.com', 'https://haste.tyman.tech' ]; - public paginateEmojis = { + #paginateEmojis = { beginning: '853667381335162910', back: '853667410203770881', stop: '853667471110570034', @@ -121,7 +121,7 @@ export class BushClientUtil extends ClientUtil { }; /** A simple promise exec method */ - private exec = promisify(exec); + #exec = promisify(exec); /** * Creates this client util @@ -158,7 +158,7 @@ export class BushClientUtil extends ClientUtil { stdout: string; stderr: string; }> { - return await this.exec(command); + return await this.#exec(command); } /** @@ -167,7 +167,7 @@ export class BushClientUtil extends ClientUtil { * @returns The url of the posted text */ public async haste(content: string): Promise { - for (const url of this.hasteURLs) { + for (const url of this.#hasteURLs) { try { const res: hastebinRes = await got.post(`${url}/documents`, { body: content }).json(); return `${url}/${res.key}`; @@ -301,7 +301,7 @@ export class BushClientUtil extends ClientUtil { text: string | null = null, deleteOnExit?: boolean ): Promise { - const paginateEmojis = this.paginateEmojis; + const paginateEmojis = this.#paginateEmojis; if (deleteOnExit === undefined) deleteOnExit = true; if (embeds.length === 1) { @@ -407,7 +407,7 @@ export class BushClientUtil extends ClientUtil { /** Sends a message with a button for the user to delete it. */ public async sendWithDeleteButton(message: BushMessage | BushSlashMessage, options: MessageOptions): Promise { - const paginateEmojis = this.paginateEmojis; + const paginateEmojis = this.#paginateEmojis; updateOptions(); const msg = await message.util.reply(options as MessageOptions & { split?: false }); const filter = (interaction: ButtonInteraction) => interaction.customId == 'paginate__stop' && interaction.message == msg; @@ -465,7 +465,7 @@ export class BushClientUtil extends ClientUtil { return tildes + language + '\n' + code2 + '\n' + tildes + (hasteOut.length ? '\n' + hasteOut : ''); } - private mapCredential(old: string) { + #mapCredential(old: string): string { const mapping = { ['token']: 'Main Token', ['devToken']: 'Dev Token', @@ -481,7 +481,7 @@ export class BushClientUtil extends ClientUtil { public redact(text: string) { for (const credentialName in client.config.credentials) { const credential = client.config.credentials[credentialName]; - const replacement = this.mapCredential(credentialName); + const replacement = this.#mapCredential(credentialName); const escapeRegex = /[.*+?^${}()|[\]\\]/g; text = text.replace(new RegExp(credential.toString().replace(escapeRegex, '\\$&'), 'g'), `[${replacement} Omitted]`); text = text.replace( @@ -702,7 +702,7 @@ export class BushClientUtil extends ClientUtil { const expires = options.duration ? new Date(new Date().getTime() + options.duration) : null; const user = client.users.resolveId(options.user); const guild = client.guilds.resolveId(options.guild); - const type = this.findTypeEnum(options.type); + const type = this.#findTypeEnum(options.type); const entry = options.extraInfo ? ActivePunishment.build({ user, type, guild, expires, modlog: options.modlog, extraInfo: options.extraInfo }) @@ -720,7 +720,7 @@ export class BushClientUtil extends ClientUtil { }): Promise { const user = client.users.resolveId(options.user); const guild = client.guilds.resolveId(options.guild); - const type = this.findTypeEnum(options.type); + const type = this.#findTypeEnum(options.type); let success = true; @@ -743,7 +743,7 @@ export class BushClientUtil extends ClientUtil { return success; } - private findTypeEnum(type: 'mute' | 'ban' | 'role' | 'block') { + #findTypeEnum(type: 'mute' | 'ban' | 'role' | 'block') { const typeMap = { ['mute']: ActivePunishmentType.MUTE, ['ban']: ActivePunishmentType.BAN, @@ -915,4 +915,11 @@ export class BushClientUtil extends ClientUtil { return Argument.withInput(type); } })(); + + /** + * Wait an amount in seconds. + */ + public async sleep(s: number): Promise { + return new Promise((resolve) => setTimeout(resolve, s * 1000)); + } } diff --git a/src/lib/extensions/discord.js/BushApplicationCommand.ts b/src/lib/extensions/discord.js/BushApplicationCommand.ts index 2acf7f8..171e2ad 100644 --- a/src/lib/extensions/discord.js/BushApplicationCommand.ts +++ b/src/lib/extensions/discord.js/BushApplicationCommand.ts @@ -4,7 +4,7 @@ import { ApplicationCommand, Snowflake } from 'discord.js'; import { BushClient } from '../discord-akairo/BushClient'; import { BushGuild } from './BushGuild'; -export class BushApplicationCommand extends ApplicationCommand { +export class BushApplicationCommand extends ApplicationCommand { public declare readonly client: BushClient; public declare guild: BushGuild | null; diff --git a/src/lib/extensions/discord.js/BushChannel.d.ts b/src/lib/extensions/discord.js/BushChannel.d.ts index 482dd9b..5aa3422 100644 --- a/src/lib/extensions/discord.js/BushChannel.d.ts +++ b/src/lib/extensions/discord.js/BushChannel.d.ts @@ -1,10 +1,7 @@ import { Snowflake } from 'discord-api-types'; import { Channel, ChannelMention } from 'discord.js'; import { ChannelTypes } from 'discord.js/typings/enums'; -import { BushClient } from '../discord-akairo/BushClient'; -import { BushDMChannel } from './BushDMChannel'; -import { BushNewsChannel } from './BushNewsChannel'; -import { BushTextChannel } from './BushTextChannel'; +import { BushClient, BushTextBasedChannels } from '../discord-akairo/BushClient'; import { BushThreadChannel } from './BushThreadChannel'; export class BushChannel extends Channel { @@ -17,7 +14,7 @@ export class BushChannel extends Channel { public type: keyof typeof ChannelTypes; public delete(): Promise; public fetch(force?: boolean): Promise; - public isText(): this is BushTextChannel | BushDMChannel | BushNewsChannel | BushThreadChannel; + public isText(): this is BushTextBasedChannels; public isThread(): this is BushThreadChannel; public toString(): ChannelMention; } diff --git a/src/lib/extensions/discord.js/BushGuildMember.ts b/src/lib/extensions/discord.js/BushGuildMember.ts index 142b766..ec0e323 100644 --- a/src/lib/extensions/discord.js/BushGuildMember.ts +++ b/src/lib/extensions/discord.js/BushGuildMember.ts @@ -82,21 +82,16 @@ export class BushGuildMember extends GuildMember { public async warn(options: BushPunishmentOptions): Promise<{ result: WarnResponse; caseNum: number }> { const moderator = client.users.cache.get(client.users.resolveId(options.moderator || client.user)); // add modlog entry - const result = await util - .createModLogEntry( - { - type: ModLogType.WARN, - user: this, - moderator: moderator.id, - reason: options.reason, - guild: this.guild - }, - true - ) - .catch((e) => { - void client.console.error('warn', e, true, 1); - return { log: null, caseNum: null }; - }); + const result = await util.createModLogEntry( + { + type: ModLogType.WARN, + user: this, + moderator: moderator.id, + reason: options.reason, + guild: this.guild + }, + true + ); if (!result || !result.log) return { result: 'error creating modlog entry', caseNum: null }; // dm user @@ -113,33 +108,31 @@ export class BushGuildMember extends GuildMember { } public async addRole(options: AddRoleOptions): Promise { - const ifShouldAddRole = this.checkIfShouldAddRole(options.role); + const ifShouldAddRole = this.#checkIfShouldAddRole(options.role); if (ifShouldAddRole !== true) return ifShouldAddRole; const moderator = client.users.cache.get(client.users.resolveId(options.moderator || client.user)); if (options.addToModlog) { - const { log: modlog } = await util - .createModLogEntry({ - type: options.duration ? ModLogType.TEMP_PUNISHMENT_ROLE : ModLogType.PERM_PUNISHMENT_ROLE, - guild: this.guild, - moderator: moderator.id, - user: this, - reason: 'N/A' - }) - .catch(() => null); + const { log: modlog } = await util.createModLogEntry({ + type: options.duration ? ModLogType.TEMP_PUNISHMENT_ROLE : ModLogType.PERM_PUNISHMENT_ROLE, + guild: this.guild, + moderator: moderator.id, + user: this, + reason: 'N/A' + }); + if (!modlog) return 'error creating modlog entry'; - const punishmentEntrySuccess = await util - .createPunishmentEntry({ - type: 'role', - user: this, - guild: this.guild, - duration: options.duration, - modlog: modlog.id, - extraInfo: options.role.id - }) - .catch(() => null); + const punishmentEntrySuccess = await util.createPunishmentEntry({ + type: 'role', + user: this, + guild: this.guild, + duration: options.duration, + modlog: modlog.id, + extraInfo: options.role.id + }); + if (!punishmentEntrySuccess) return 'error creating role entry'; } @@ -150,30 +143,28 @@ export class BushGuildMember extends GuildMember { } public async removeRole(options: RemoveRoleOptions): Promise { - const ifShouldAddRole = this.checkIfShouldAddRole(options.role); + const ifShouldAddRole = this.#checkIfShouldAddRole(options.role); if (ifShouldAddRole !== true) return ifShouldAddRole; const moderator = client.users.cache.get(client.users.resolveId(options.moderator || client.user)); if (options.addToModlog) { - const { log: modlog } = await util - .createModLogEntry({ - type: ModLogType.PERM_PUNISHMENT_ROLE, - guild: this.guild, - moderator: moderator.id, - user: this, - reason: 'N/A' - }) - .catch(() => null); + const { log: modlog } = await util.createModLogEntry({ + type: ModLogType.PERM_PUNISHMENT_ROLE, + guild: this.guild, + moderator: moderator.id, + user: this, + reason: 'N/A' + }); + if (!modlog) return 'error creating modlog entry'; - const punishmentEntrySuccess = await util - .removePunishmentEntry({ - type: 'role', - user: this, - guild: this.guild - }) - .catch(() => null); + const punishmentEntrySuccess = await util.removePunishmentEntry({ + type: 'role', + user: this, + guild: this.guild + }); + if (!punishmentEntrySuccess) return 'error removing role entry'; } @@ -183,13 +174,13 @@ export class BushGuildMember extends GuildMember { return 'success'; } - private checkIfShouldAddRole(role: BushRole | Role) { + #checkIfShouldAddRole(role: BushRole | Role): true | 'user hierarchy' | 'role managed' | 'client hierarchy' { if (this.roles.highest.position <= role.position) { - return `user hierarchy`; + return 'user hierarchy'; } else if (role.managed) { - return `role managed`; + return 'role managed'; } else if (this.guild.me.roles.highest.position <= role.position) { - return `client hierarchy`; + return 'client hierarchy'; } return true; } @@ -212,28 +203,26 @@ export class BushGuildMember extends GuildMember { if (!muteSuccess) return 'error giving mute role'; // add modlog entry - const { log: modlog } = await util - .createModLogEntry({ - type: options.duration ? ModLogType.TEMP_MUTE : ModLogType.PERM_MUTE, - user: this, - moderator: moderator.id, - reason: options.reason, - duration: options.duration, - guild: this.guild - }) - .catch(() => null); + const { log: modlog } = await util.createModLogEntry({ + type: options.duration ? ModLogType.TEMP_MUTE : ModLogType.PERM_MUTE, + user: this, + moderator: moderator.id, + reason: options.reason, + duration: options.duration, + guild: this.guild + }); + if (!modlog) return 'error creating modlog entry'; // add punishment entry so they can be unmuted later - const punishmentEntrySuccess = await util - .createPunishmentEntry({ - type: 'mute', - user: this, - guild: this.guild, - duration: options.duration, - modlog: modlog.id - }) - .catch(() => null); + const punishmentEntrySuccess = await util.createPunishmentEntry({ + type: 'mute', + user: this, + guild: this.guild, + duration: options.duration, + modlog: modlog.id + }); + if (!punishmentEntrySuccess) return 'error creating mute entry'; // dm user @@ -242,7 +231,7 @@ export class BushGuildMember extends GuildMember { content: `You have been muted ${ options.duration ? 'for ' + util.humanizeDuration(options.duration) : 'permanently' } in **${this.guild}** for **${options.reason || 'No reason provided'}**.${ending ? `\n\n${ending}` : ''}` - }).catch(() => null); + }); if (!dmSuccess) return 'failed to dm'; @@ -267,25 +256,23 @@ export class BushGuildMember extends GuildMember { if (!muteSuccess) return 'error removing mute role'; //remove modlog entry - const { log: modlog } = await util - .createModLogEntry({ - type: ModLogType.UNMUTE, - user: this, - moderator: moderator.id, - reason: options.reason, - guild: this.guild - }) - .catch(() => null); + const { log: modlog } = await util.createModLogEntry({ + type: ModLogType.UNMUTE, + user: this, + moderator: moderator.id, + reason: options.reason, + guild: this.guild + }); + if (!modlog) return 'error creating modlog entry'; // remove mute entry - const removePunishmentEntrySuccess = await util - .removePunishmentEntry({ - type: 'mute', - user: this, - guild: this.guild - }) - .catch(() => null); + const removePunishmentEntrySuccess = await util.removePunishmentEntry({ + type: 'mute', + user: this, + guild: this.guild + }); + if (!removePunishmentEntrySuccess) return 'error removing mute entry'; //dm user @@ -353,28 +340,24 @@ export class BushGuildMember extends GuildMember { if (!banSuccess) return 'error banning'; // add modlog entry - const { log: modlog } = await util - .createModLogEntry({ - type: options.duration ? ModLogType.TEMP_BAN : ModLogType.PERM_BAN, - user: this, - moderator: moderator.id, - reason: options.reason, - duration: options.duration, - guild: this.guild - }) - .catch(() => null); + const { log: modlog } = await util.createModLogEntry({ + type: options.duration ? ModLogType.TEMP_BAN : ModLogType.PERM_BAN, + user: this, + moderator: moderator.id, + reason: options.reason, + duration: options.duration, + guild: this.guild + }); if (!modlog) return 'error creating modlog entry'; // add punishment entry so they can be unbanned later - const punishmentEntrySuccess = await util - .createPunishmentEntry({ - type: 'ban', - user: this, - guild: this.guild, - duration: options.duration, - modlog: modlog.id - }) - .catch(() => null); + const punishmentEntrySuccess = await util.createPunishmentEntry({ + type: 'ban', + user: this, + guild: this.guild, + duration: options.duration, + modlog: modlog.id + }); if (!punishmentEntrySuccess) return 'error creating ban entry'; if (!dmSuccess) return 'failed to dm'; diff --git a/src/lib/models/ActivePunishment.ts b/src/lib/models/ActivePunishment.ts index a757b10..fb2e79f 100644 --- a/src/lib/models/ActivePunishment.ts +++ b/src/lib/models/ActivePunishment.ts @@ -29,6 +29,8 @@ export interface ActivePunishmentModelCreationAttributes { modlog: string; } +const NEVER_USED = 'This should never be executed'; + export class ActivePunishment extends BaseModel implements ActivePunishmentModel @@ -37,73 +39,73 @@ export class ActivePunishment * The ID of this punishment (no real use just for a primary key) */ public get id(): string { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set id(_: string) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * The type of punishment. */ public get type(): ActivePunishmentType { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set type(_: ActivePunishmentType) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * The user who is punished. */ public get user(): Snowflake { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set user(_: Snowflake) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * The guild they are punished in. */ public get guild(): Snowflake { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set guild(_: Snowflake) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * Additional info about the punishment if applicable. The channel id for channel blocks and role for punishment roles. */ public get extraInfo(): Snowflake { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set extraInfo(_: Snowflake) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * The date when this punishment expires (optional). */ public get expires(): Date | null { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set expires(_: Date | null) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * The reference to the modlog entry. */ public get modlog(): string { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set modlog(_: string) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } - static initModel(sequelize: Sequelize): void { + public static initModel(sequelize: Sequelize): void { ActivePunishment.init( { id: { diff --git a/src/lib/models/BaseModel.ts b/src/lib/models/BaseModel.ts index f1521dd..8ed5ed3 100644 --- a/src/lib/models/BaseModel.ts +++ b/src/lib/models/BaseModel.ts @@ -1,17 +1,19 @@ import { Model } from 'sequelize'; +const NEVER_USED = 'This should never be executed'; + export abstract class BaseModel extends Model { /** * The date when the row was created. */ public get createdAt(): Date { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * The date when the row was last updated. */ public get updatedAt(): Date { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } } diff --git a/src/lib/models/Global.ts b/src/lib/models/Global.ts index a685d91..36c72d8 100644 --- a/src/lib/models/Global.ts +++ b/src/lib/models/Global.ts @@ -20,68 +20,70 @@ export interface GlobalModelCreationAttributes { blacklistedChannels?: Snowflake[]; } +const NEVER_USED = 'This should never be executed'; + export class Global extends BaseModel implements GlobalModel { /** * The bot's environment. */ public get environment(): 'production' | 'development' | 'beta' { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set environment(_: 'production' | 'development' | 'beta') { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * Trusted users. */ public get superUsers(): Snowflake[] { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set superUsers(_: Snowflake[]) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * Globally disabled commands. */ public get disabledCommands(): string[] { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set disabledCommands(_: string[]) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * Globally blacklisted users. */ public get blacklistedUsers(): Snowflake[] { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set blacklistedUsers(_: Snowflake[]) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * Guilds blacklisted from using the bot. */ public get blacklistedGuilds(): Snowflake[] { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set blacklistedGuilds(_: Snowflake[]) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * Channels where the bot is prevented from running. */ public get blacklistedChannels(): Snowflake[] { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set blacklistedChannels(_: Snowflake[]) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } - static initModel(sequelize: Sequelize): void { + public static initModel(sequelize: Sequelize): void { Global.init( { environment: { diff --git a/src/lib/models/Guild.ts b/src/lib/models/Guild.ts index c28fe64..3473ea4 100644 --- a/src/lib/models/Guild.ts +++ b/src/lib/models/Guild.ts @@ -31,118 +31,120 @@ export interface GuildModelCreationAttributes { autoModPhases?: string[]; } +const NEVER_USED = 'This should never be executed'; + export class Guild extends BaseModel implements GuildModel { /** * The ID of the guild */ public get id(): Snowflake { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set id(_: Snowflake) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * The bot's prefix for the guild */ public get prefix(): string { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set prefix(_: string) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * Channels that will have their messages automatically published */ public get autoPublishChannels(): Snowflake[] { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set autoPublishChannels(_: Snowflake[]) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * Channels where the bot won't respond in. */ public get blacklistedChannels(): Snowflake[] { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set blacklistedChannels(_: Snowflake[]) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * Users that the bot ignores in this guild */ public get blacklistedUsers(): Snowflake[] { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set blacklistedUsers(_: Snowflake[]) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * The channels where the welcome messages are sent */ public get welcomeChannel(): Snowflake { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set welcomeChannel(_: Snowflake) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * The role given out when muting someone */ public get muteRole(): Snowflake { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set muteRole(_: Snowflake) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * The message that gets sent after someone gets a punishment dm */ public get punishmentEnding(): string { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set punishmentEnding(_: string) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * Guild specific disabled commands */ public get disabledCommands(): string[] { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set disabledCommands(_: string[]) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * Channels that should get locked down when the lockdown command gets used. */ public get lockdownChannels(): Snowflake[] { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set lockdownChannels(_: Snowflake[]) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * Custom automod phases */ public get autoModPhases(): string[] { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set autoModPhases(_: string[]) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } - static initModel(sequelize: Sequelize, client: BushClient): void { + public static initModel(sequelize: Sequelize, client: BushClient): void { Guild.init( { id: { @@ -150,7 +152,7 @@ export class Guild extends BaseModel i primaryKey: true }, prefix: { - type: DataTypes.STRING, + type: DataTypes.TEXT, allowNull: false, defaultValue: client.config.prefix }, diff --git a/src/lib/models/Level.ts b/src/lib/models/Level.ts index 309e6e6..ad64747 100644 --- a/src/lib/models/Level.ts +++ b/src/lib/models/Level.ts @@ -14,42 +14,47 @@ export interface LevelModelCreationAttributes { xp?: number; } +const NEVER_USED = 'This should never be executed'; + export class Level extends BaseModel { /** * The user's id. */ public get user(): Snowflake { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set user(_: Snowflake) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * The guild where the user is gaining xp. */ public get guild(): Snowflake { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set guild(_: Snowflake) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * The user's xp. */ public get xp(): number { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set xp(_: number) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } + /** + * The user's level. + */ public get level(): number { return Level.convertXpToLevel(this.xp); } - static initModel(sequelize: Sequelize): void { + public static initModel(sequelize: Sequelize): void { Level.init( { user: { diff --git a/src/lib/models/ModLog.ts b/src/lib/models/ModLog.ts index 33c758f..5da6027 100644 --- a/src/lib/models/ModLog.ts +++ b/src/lib/models/ModLog.ts @@ -28,6 +28,7 @@ export interface ModLogModel { reason: string; duration: number; guild: Snowflake; + evidence: string; } export interface ModLogModelCreationAttributes { @@ -38,80 +39,93 @@ export interface ModLogModelCreationAttributes { reason?: string; duration?: number; guild: Snowflake; + evidence?: string; } +const NEVER_USED = 'This should never be executed'; + export class ModLog extends BaseModel implements ModLogModel { /** * The primary key of the modlog entry. */ public get id(): string { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set id(_: string) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * The type of punishment. */ public get type(): ModLogType { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set type(_: ModLogType) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * The user being punished. */ public get user(): Snowflake { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set user(_: Snowflake) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * The user carrying out the punishment. */ public get moderator(): Snowflake { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set moderator(_: Snowflake) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * The reason the user is getting punished */ public get reason(): string | null { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set reason(_: string | null) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * The amount of time the user is getting punished for. */ public get duration(): number | null { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set duration(_: number | null) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * The guild the user is getting punished in. */ public get guild(): Snowflake { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set guild(_: Snowflake) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } - static initModel(sequelize: Sequelize): void { + /** + * Evidence of what the user is getting punished for. + */ + public get evidence(): string { + throw new Error(NEVER_USED); + } + public set evidence(_: string) { + throw new Error(NEVER_USED); + } + + public static initModel(sequelize: Sequelize): void { ModLog.init( { id: { @@ -137,7 +151,7 @@ export class ModLog extends BaseModel implements StickyRoleModel { /** * The id of the user the roles belongs to */ - public get user(): Snowflake { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set user(_: Snowflake) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * The guild where this should happen */ public get guild(): Snowflake { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set guild(_: Snowflake) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } /** * The roles that the user should have returned */ public get roles(): Snowflake[] { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } public set roles(_: Snowflake[]) { - throw new Error('This should never be executed'); + throw new Error(NEVER_USED); } - static initModel(sequelize: Sequelize): void { + public static initModel(sequeli