aboutsummaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/badlinks.json242
-rw-r--r--src/lib/extensions/discord-akairo/BushClient.ts14
-rw-r--r--src/lib/extensions/discord-akairo/BushClientUtil.ts31
-rw-r--r--src/lib/extensions/discord.js/BushApplicationCommand.ts2
-rw-r--r--src/lib/extensions/discord.js/BushChannel.d.ts7
-rw-r--r--src/lib/extensions/discord.js/BushGuildMember.ts205
-rw-r--r--src/lib/models/ActivePunishment.ts32
-rw-r--r--src/lib/models/BaseModel.ts6
-rw-r--r--src/lib/models/Global.ts28
-rw-r--r--src/lib/models/Guild.ts50
-rw-r--r--src/lib/models/Level.ts19
-rw-r--r--src/lib/models/ModLog.ts50
-rw-r--r--src/lib/models/StickyRole.ts17
-rw-r--r--src/lib/utils/BushCache.ts16
-rw-r--r--src/lib/utils/BushConstants.ts41
-rw-r--r--src/lib/utils/BushLogger.ts85
16 files changed, 440 insertions, 405 deletions
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<Snowflake, BushThreadChannel>;
hasMore?: boolean;
@@ -96,7 +98,7 @@ const rl = readline.createInterface({
type If<T extends boolean, A, B = null> = T extends true ? A : T extends false ? B : A | B;
-export class BushClient<Ready extends boolean = boolean> extends AkairoClient {
+export class BushClient<Ready extends boolean = boolean> extends AkairoClient<Ready> {
public static preStart(): void {
Structures.extend('GuildEmoji', () => BushGuildEmoji);
Structures.extend('DMChannel', () => BushDMChannel);
@@ -134,7 +136,7 @@ export class BushClient<Ready extends boolean = boolean> 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<Ready extends boolean = boolean> 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<Ready extends boolean = boolean> 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<Ready extends boolean = boolean> extends AkairoClient {
}
// Initialize everything
- private async _init(): Promise<void> {
+ async #init(): Promise<void> {
this.commandHandler.useListenerHandler(this.listenerHandler);
this.commandHandler.useInhibitorHandler(this.inhibitorHandler);
this.commandHandler.ignorePermissions = this.config.owners;
@@ -296,7 +296,7 @@ export class BushClient<Ready extends boolean = boolean> 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<string> {
- 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<void> {
- 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<void> {
- 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<boolean> {
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<unknown> {
+ 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<PermissionsFetchType = {}> extends ApplicationCommand {
+export class BushApplicationCommand<PermissionsFetchType = {}> extends ApplicationCommand<PermissionsFetchType> {
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<BushChannel>;
public fetch(force?: boolean): Promise<BushChannel>;
- 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<AddRoleResponse> {
- 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<RemoveRoleResponse> {
- 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<ActivePunishmentModel, ActivePunishmentModelCreationAttributes>
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<A, B> extends Model<A, B> {
/**
* 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<GlobalModel, GlobalModelCreationAttributes> 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<GuildModel, GuildModelCreationAttributes> 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<GuildModel, GuildModelCreationAttributes> 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<LevelModel, LevelModelCreationAttributes> {
/**
* 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<ModLogModel, ModLogModelCreationAttributes> 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<ModLogModel, ModLogModelCreationAttributes
allowNull: true
},
reason: {
- type: DataTypes.STRING,
+ type: DataTypes.TEXT,
allowNull: true
},
guild: {
@@ -146,6 +160,10 @@ export class ModLog extends BaseModel<ModLogModel, ModLogModelCreationAttributes
model: 'Guilds',
key: 'id'
}
+ },
+ evidence: {
+ type: DataTypes.TEXT,
+ allowNull: true
}
},
{ sequelize: sequelize }
diff --git a/src/lib/models/StickyRole.ts b/src/lib/models/StickyRole.ts
index 46650a4..b49af80 100644
--- a/src/lib/models/StickyRole.ts
+++ b/src/lib/models/StickyRole.ts
@@ -13,39 +13,40 @@ export interface StickyRoleModelCreationAttributes {
roles: Snowflake[];
}
+const NEVER_USED = 'This should never be executed';
+
export class StickyRole extends BaseModel<StickyRoleModel, StickyRoleModelCreationAttributes> 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(sequelize: Sequelize): void {
StickyRole.init(
{
user: {
diff --git a/src/lib/utils/BushCache.ts b/src/lib/utils/BushCache.ts
index f9def5e..cdf328b 100644
--- a/src/lib/utils/BushCache.ts
+++ b/src/lib/utils/BushCache.ts
@@ -1,15 +1,13 @@
import { Collection, Snowflake } from 'discord.js';
import { Guild } from '../models/Guild';
-class GlobalCache {
- public static superUsers = new Array<Snowflake>();
- public static disabledCommands = new Array<string>();
- public static blacklistedChannels = new Array<Snowflake>();
- public static blacklistedGuilds = new Array<Snowflake>();
- public static blacklistedUsers = new Array<Snowflake>();
-}
-
export class BushCache {
- public static global = GlobalCache;
+ public static global = {
+ superUsers: new Array<Snowflake>(),
+ disabledCommands: new Array<string>(),
+ blacklistedChannels: new Array<Snowflake>(),
+ blacklistedGuilds: new Array<Snowflake>(),
+ blacklistedUsers: new Array<Snowflake>()
+ };
public static guilds = new Collection<Snowflake, Guild>();
}
diff --git a/src/lib/utils/BushConstants.ts b/src/lib/utils/BushConstants.ts
index 97f86c4..391db75 100644
--- a/src/lib/utils/BushConstants.ts
+++ b/src/lib/utils/BushConstants.ts
@@ -186,36 +186,25 @@ export class BushConstants {
maybeNitroDiscrims: ['1111', '2222', '3333', '4444', '5555', '6666', '6969', '7777', '8888', '9999'],
+ // prettier-ignore
capes: [
- // supporter capes
+ /* supporter capes */
{ name: 'patreon1', index: 0 },
{ name: 'patreon2', index: 1 },
{ name: 'fade', custom: 'https://raw.githubusercontent.com/NotEnoughUpdates/capes/master/fade.gif', index: 2 },
{ name: 'lava', custom: 'https://raw.githubusercontent.com/NotEnoughUpdates/capes/master/lava.gif', index: 3 },
- {
- name: 'mcworld',
- custom: 'https://raw.githubusercontent.com/NotEnoughUpdates/capes/master/mcworld_compressed.gif',
- index: 4
- },
- {
- name: 'negative',
- custom: 'https://raw.githubusercontent.com/NotEnoughUpdates/capes/master/negative_compressed.gif',
- index: 5
- },
- {
- name: 'space',
- custom: 'https://raw.githubusercontent.com/NotEnoughUpdates/capes/master/space_compressed.gif',
- index: 6
- },
+ { name: 'mcworld', custom: 'https://raw.githubusercontent.com/NotEnoughUpdates/capes/master/mcworld_compressed.gif', index: 4 },
+ { name: 'negative', custom: 'https://raw.githubusercontent.com/NotEnoughUpdates/capes/master/negative_compressed.gif', index: 5 },
+ { name: 'space', custom: 'https://raw.githubusercontent.com/NotEnoughUpdates/capes/master/space_compressed.gif', index: 6 },
{ name: 'void', custom: 'https://raw.githubusercontent.com/NotEnoughUpdates/capes/master/void.gif', index: 7 },
{ name: 'tunnel', custom: 'https://raw.githubusercontent.com/NotEnoughUpdates/capes/master/tunnel.gif', index: 8 },
- // Staff capes
+ /* Staff capes */
{ name: 'contrib', index: 9 },
{ name: 'mbstaff', index: 10 },
{ name: 'ironmoon', index: 11 },
{ name: 'gravy', index: 12 },
{ name: 'nullzee', index: 13 },
- // partner capes
+ /* partner capes */
{ name: 'thebakery', index: 14 },
{ name: 'dsm', index: 15 },
{ name: 'packshq', index: 16 },
@@ -224,12 +213,16 @@ export class BushConstants {
{ name: 'sbp', index: 19 },
{ name: 'subreddit_light', index: 20 },
{ name: 'subreddit_dark', index: 21 },
- // streamer capes
- { name: 'alexxoffi', index: 22 },
- { name: 'jakethybro', index: 23 },
- { name: 'krusty', index: 24 },
- { name: 'soldier', index: 25 },
- { name: 'zera', index: 26 }
+ {name : 'skyclient', index: 22 },
+ /* streamer capes */
+ { name: 'alexxoffi', index: 23 },
+ { name: 'jakethybro', index: 24 },
+ { name: 'krusty', index: 25 },
+ { name: 'krusty_day', index: 26 },
+ { name: 'krusty_night', index: 27 },
+ { name: 'krusty_sunset', index: 28 },
+ { name: 'soldier', index: 29 },
+ { name: 'zera', index: 30 },
],
roleMap: [
{ name: '*', id: '792453550768390194' },
diff --git a/src/lib/utils/BushLogger.ts b/src/lib/utils/BushLogger.ts
index e7532d8..cf5969c 100644
--- a/src/lib/utils/BushLogger.ts
+++ b/src/lib/utils/BushLogger.ts
@@ -1,17 +1,12 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
import chalk from 'chalk';
-import { MessageEmbed } from 'discord.js';
+import { MessageEmbed, Util } from 'discord.js';
import { inspect } from 'util';
-import { BushClient, BushSendMessageType } from '../extensions/discord-akairo/BushClient';
+import { BushSendMessageType } from '../extensions/discord-akairo/BushClient';
export class BushLogger {
- private client: BushClient;
- public constructor(client: BushClient) {
- this.client = client;
- }
-
- private parseFormatting(
+ static #parseFormatting(
content: any,
color: 'blueBright' | 'blackBright' | 'redBright' | 'yellowBright' | 'greenBright' | '',
discordFormat = false
@@ -21,22 +16,22 @@ export class BushLogger {
const tempParsedArray: Array<string> = [];
newContent.forEach((value, index) => {
if (index % 2 !== 0) {
- tempParsedArray.push(discordFormat ? `**${value}**` : chalk[color](value));
+ tempParsedArray.push(discordFormat ? `**${Util.escapeMarkdown(value)}**` : chalk[color](value));
} else {
- tempParsedArray.push(value);
+ tempParsedArray.push(Util.escapeMarkdown(value));
}
});
return tempParsedArray.join('');
}
- private inspectContent(content: any, depth = 2, colors = true): string {
+ static #inspectContent(content: any, depth = 2, colors = true): string {
if (typeof content !== 'string') {
return inspect(content, { depth, colors });
}
return content;
}
- private stripColor(text: string): string {
+ static #stripColor(text: string): string {
return text.replace(
// eslint-disable-next-line no-control-regex
/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,
@@ -44,7 +39,7 @@ export class BushLogger {
);
}
- private getTimeStamp(): string {
+ static #getTimeStamp(): string {
const now = new Date();
const hours = now.getHours();
const minute = now.getMinutes();
@@ -64,18 +59,18 @@ export class BushLogger {
* @param sendChannel - Should this also be logged to discord? Defaults to false.
* @param depth - The depth the content will inspected. Defaults to 0.
*/
- public get log() {
- return this.info;
+ public static get log() {
+ return BushLogger.info;
}
/** Sends a message to the log channel */
- public async channelLog(message: BushSendMessageType): Promise<void> {
+ public static async channelLog(message: BushSendMessageType): Promise<void> {
const channel = await util.getConfigChannel('log');
await channel.send(message).catch(() => {});
}
/** Sends a message to the error channel */
- public async channelError(message: BushSendMessageType): Promise<void> {
+ public static async channelError(message: BushSendMessageType): Promise<void> {
const channel = await util.getConfigChannel('error');
await channel.send(message).catch(() => {});
}
@@ -85,19 +80,19 @@ export class BushLogger {
* @param content - The content to log.
* @param depth - The depth the content will inspected. Defaults to 0.
*/
- public debug(content: any, depth = 0): void {
+ public static debug(content: any, depth = 0): void {
if (!client.config.isDevelopment) return;
- const newContent = this.inspectContent(content, depth, true);
- console.log(`${chalk.bgMagenta(this.getTimeStamp())} ${chalk.magenta('[Debug]')}`, newContent);
+ const newContent = this.#inspectContent(content, depth, true);
+ console.log(`${chalk.bgMagenta(this.#getTimeStamp())} ${chalk.magenta('[Debug]')}`, newContent);
}
/**
* Logs raw debug information. Only works in dev is enabled in the config.
* @param content - The content to log.
*/
- public debugRaw(...content: any): void {
+ public static debugRaw(...content: any): void {
if (!client.config.isDevelopment) return;
- console.log(`${chalk.bgMagenta(this.getTimeStamp())} ${chalk.magenta('[Debug]')}`, ...content);
+ console.log(`${chalk.bgMagenta(this.#getTimeStamp())} ${chalk.magenta('[Debug]')}`, ...content);
}
/**
@@ -107,15 +102,15 @@ export class BushLogger {
* @param sendChannel - Should this also be logged to discord? Defaults to false.
* @param depth - The depth the content will inspected. Defaults to 0.
*/
- public async verbose(header: string, content: any, sendChannel = false, depth = 0): Promise<void> {
+ public static async verbose(header: string, content: any, sendChannel = false, depth = 0): Promise<void> {
if (!client.config.logging.verbose) return;
- const newContent = this.inspectContent(content, depth, true);
+ const newContent = this.#inspectContent(content, depth, true);
console.info(
- `${chalk.bgGrey(this.getTimeStamp())} ${chalk.grey(`[${header}]`)} ` + this.parseFormatting(newContent, 'blackBright')
+ `${chalk.bgGrey(this.#getTimeStamp())} ${chalk.grey(`[${header}]`)} ` + this.#parseFormatting(newContent, 'blackBright')
);
if (!sendChannel) return;
const embed = new MessageEmbed()
- .setDescription(`**[${header}]** ${this.parseFormatting(this.stripColor(newContent), '', true)}`)
+ .setDescription(`**[${header}]** ${this.#parseFormatting(this.#stripColor(newContent), '', true)}`)
.setColor(util.colors.gray)
.setTimestamp();
await this.channelLog({ embeds: [embed] });
@@ -128,15 +123,15 @@ export class BushLogger {
* @param sendChannel - Should this also be logged to discord? Defaults to false.
* @param depth - The depth the content will inspected. Defaults to 0.
*/
- public async info(header: string, content: any, sendChannel = true, depth = 0): Promise<void> {
+ public static async info(header: string, content: any, sendChannel = true, depth = 0): Promise<void> {
if (!client.config.logging.info) return;
- const newContent = this.inspectContent(content, depth, true);
+ const newContent = this.#inspectContent(content, depth, true);
console.info(
- `${chalk.bgCyan(this.getTimeStamp())} ${chalk.cyan(`[${header}]`)} ` + this.parseFormatting(newContent, 'blueBright')
+ `${chalk.bgCyan(this.#getTimeStamp())} ${chalk.cyan(`[${header}]`)} ` + this.#parseFormatting(newContent, 'blueBright')
);
if (!sendChannel) return;
const embed = new MessageEmbed()
- .setDescription(`**[${header}]** ${this.parseFormatting(this.stripColor(newContent), '', true)}`)
+ .setDescription(`**[${header}]** ${this.#parseFormatting(this.#stripColor(newContent), '', true)}`)
.setColor(util.colors.info)
.setTimestamp();
await this.channelLog({ embeds: [embed] });
@@ -149,16 +144,16 @@ export class BushLogger {
* @param sendChannel - Should this also be logged to discord? Defaults to false.
* @param depth - The depth the content will inspected. Defaults to 0.
*/
- public async warn(header: string, content: any, sendChannel = true, depth = 0): Promise<void> {
- const newContent = this.inspectContent(content, depth, true);
+ public static async warn(header: string, content: any, sendChannel = true, depth = 0): Promise<void> {
+ const newContent = this.#inspectContent(content, depth, true);
console.warn(
- `${chalk.bgYellow(this.getTimeStamp())} ${chalk.yellow(`[${header}]`)} ` +
- this.parseFormatting(newContent, 'yellowBright')
+ `${chalk.bgYellow(this.#getTimeStamp())} ${chalk.yellow(`[${header}]`)} ` +
+ this.#parseFormatting(newContent, 'yellowBright')
);
if (!sendChannel) return;
const embed = new MessageEmbed()
- .setDescription(`**[${header}]** ${this.parseFormatting(this.stripColor(newContent), '', true)}`)
+ .setDescription(`**[${header}]** ${this.#parseFormatting(this.#stripColor(newContent), '', true)}`)
.setColor(util.colors.warn)
.setTimestamp();
await this.channelLog({ embeds: [embed] });
@@ -171,15 +166,15 @@ export class BushLogger {
* @param sendChannel - Should this also be logged to discord? Defaults to false.
* @param depth - The depth the content will inspected. Defaults to 0.
*/
- public async error(header: string, content: any, sendChannel = true, depth = 0): Promise<void> {
- const newContent = this.inspectContent(content, depth, true);
+ public static async error(header: string, content: any, sendChannel = true, depth = 0): Promise<void> {
+ const newContent = this.#inspectContent(content, depth, true);
console.error(
- `${chalk.bgRedBright(this.getTimeStamp())} ${chalk.redBright(`[${header}]`)} ` +
- this.parseFormatting(newContent, 'redBright')
+ `${chalk.bgRedBright(this.#getTimeStamp())} ${chalk.redBright(`[${header}]`)} ` +
+ this.#parseFormatting(newContent, 'redBright')
);
if (!sendChannel) return;
const embed = new MessageEmbed()
- .setDescription(`**[${header}]** ${this.parseFormatting(this.stripColor(newContent), '', true)}`)
+ .setDescription(`**[${header}]** ${this.#parseFormatting(this.#stripColor(newContent), '', true)}`)
.setColor(util.colors.error)
.setTimestamp();
await this.channelError({ embeds: [embed] });
@@ -192,15 +187,15 @@ export class BushLogger {
* @param sendChannel - Should this also be logged to discord? Defaults to false.
* @param depth - The depth the content will inspected. Defaults to 0.
*/
- public async success(header: string, content: any, sendChannel = true, depth = 0): Promise<void> {
- const newContent = this.inspectContent(content, depth, true);
+ public static async success(header: string, content: any, sendChannel = true, depth = 0): Promise<void> {
+ const newContent = this.#inspectContent(content, depth, true);
console.log(
- `${chalk.bgGreen(this.getTimeStamp())} ${chalk.greenBright(`[${header}]`)} ` +
- this.parseFormatting(newContent, 'greenBright')
+ `${chalk.bgGreen(this.#getTimeStamp())} ${chalk.greenBright(`[${header}]`)} ` +
+ this.#parseFormatting(newContent, 'greenBright')
);
if (!sendChannel) return;
const embed = new MessageEmbed()
- .setDescription(`**[${header}]** ${this.parseFormatting(this.stripColor(newContent), '', true)}`)
+ .setDescription(`**[${header}]** ${this.#parseFormatting(this.#stripColor(newContent), '', true)}`)
.setColor(util.colors.success)
.setTimestamp();
await this.channelLog({ embeds: [embed] }).catch(() => {});
generated by cgit (git 2.46.0) at 2024-11-23 05:37:06 +0000