aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIRONM00N <64110067+IRONM00N@users.noreply.github.com>2021-07-29 21:16:30 -0400
committerIRONM00N <64110067+IRONM00N@users.noreply.github.com>2021-07-29 21:16:30 -0400
commit1c6d451ffd63f9805b978e8565807e8a6b528681 (patch)
tree97ae6b3746b42ed21eb0fc3a3888bbfca36a1806 /src
parent7990abdb511eeec2a114b124a3628b10bfefc342 (diff)
downloadtanzanite-1c6d451ffd63f9805b978e8565807e8a6b528681.tar.gz
tanzanite-1c6d451ffd63f9805b978e8565807e8a6b528681.tar.bz2
tanzanite-1c6d451ffd63f9805b978e8565807e8a6b528681.zip
added a rudimentary automod, fixed a bunch of stuff, added some more listeners
Diffstat (limited to 'src')
-rw-r--r--src/commands/dev/eval.ts2
-rw-r--r--src/commands/info/avatar.ts3
-rw-r--r--src/commands/info/guildInfo.ts57
-rw-r--r--src/commands/info/userInfo.ts18
-rw-r--r--src/commands/moderation/slowmode.ts21
-rw-r--r--src/commands/skyblock-reborn/chooseColor.ts (renamed from src/commands/skyblock-reborn/chooseColorCommand.ts)4
-rw-r--r--src/lib/badlinks.json289
-rw-r--r--src/lib/badwords.json15
-rw-r--r--src/lib/extensions/discord-akairo/BushClient.ts12
-rw-r--r--src/lib/extensions/discord-akairo/BushClientUtil.ts86
-rw-r--r--src/lib/extensions/discord-akairo/BushCommand.ts7
-rw-r--r--src/lib/extensions/discord.js/BushApplicationCommandManager.d.ts43
-rw-r--r--src/lib/extensions/discord.js/BushApplicationCommandManager.ts26
-rw-r--r--src/lib/extensions/discord.js/BushApplicationCommandPermissionsManager.d.ts54
-rw-r--r--src/lib/extensions/discord.js/BushApplicationCommandPermissionsManager.ts31
-rw-r--r--src/lib/extensions/discord.js/BushClientEvents.d.ts6
-rw-r--r--src/lib/extensions/discord.js/BushGuild.ts7
-rw-r--r--src/lib/extensions/discord.js/BushGuildApplicationCommandManager.d.ts18
-rw-r--r--src/lib/extensions/discord.js/BushGuildApplicationCommandManager.ts10
-rw-r--r--src/lib/extensions/discord.js/BushGuildEmojiRoleManager.d.ts19
-rw-r--r--src/lib/extensions/discord.js/BushGuildEmojiRoleManager.ts13
-rw-r--r--src/lib/extensions/discord.js/BushGuildMemberManager.d.ts35
-rw-r--r--src/lib/extensions/discord.js/BushGuildMemberManager.ts11
-rw-r--r--src/lib/extensions/discord.js/BushMessageManager.d.ts33
-rw-r--r--src/lib/extensions/discord.js/BushMessageManager.ts15
-rw-r--r--src/lib/extensions/discord.js/BushThreadManager.d.ts25
-rw-r--r--src/lib/extensions/discord.js/BushThreadManager.ts11
-rw-r--r--src/lib/extensions/discord.js/BushThreadMemberManager.d.ts15
-rw-r--r--src/lib/extensions/discord.js/BushThreadMemberManager.ts14
-rw-r--r--src/lib/index.ts8
-rw-r--r--src/lib/utils/BushConstants.ts77
-rw-r--r--src/listeners/guild/syncUnban.ts4
-rw-r--r--src/listeners/message/autoPublisher.ts25
-rw-r--r--src/listeners/message/automodCreate.ts2
-rw-r--r--src/listeners/message/automodUpdate.ts2
-rw-r--r--src/listeners/message/blacklistedFile.ts159
-rw-r--r--src/listeners/message/booster.ts20
-rw-r--r--src/listeners/message/directMessage.ts44
-rw-r--r--src/listeners/message/verbose.ts20
-rw-r--r--src/listeners/other/consoleListener.ts1
40 files changed, 1030 insertions, 232 deletions
diff --git a/src/commands/dev/eval.ts b/src/commands/dev/eval.ts
index abdf2b9..4f6a293 100644
--- a/src/commands/dev/eval.ts
+++ b/src/commands/dev/eval.ts
@@ -86,10 +86,8 @@ export default class EvalCommand extends BushCommand {
config = client.config,
members = message.guild?.members,
roles = message.guild?.roles,
- client = client,
emojis = util.emojis,
colors = util.colors,
- util = util,
{ ActivePunishment, Global, Guild, Level, ModLog, StickyRole } = await import('@lib'),
{
ButtonInteraction,
diff --git a/src/commands/info/avatar.ts b/src/commands/info/avatar.ts
index dc10f7d..4f7449b 100644
--- a/src/commands/info/avatar.ts
+++ b/src/commands/info/avatar.ts
@@ -43,9 +43,8 @@ export default class AvatarCommand extends BushCommand {
const embed = new MessageEmbed()
.setTimestamp()
.setColor(util.colors.default)
- .setTitle(user.tag)
+ .setTitle(`${user.tag}'s Avatar`)
.setImage(user.avatarURL({ size: 2048, format: 'png', dynamic: true }));
-
await message.util.reply({ embeds: [embed] });
}
}
diff --git a/src/commands/info/guildInfo.ts b/src/commands/info/guildInfo.ts
index e82a5fe..577086b 100644
--- a/src/commands/info/guildInfo.ts
+++ b/src/commands/info/guildInfo.ts
@@ -1,8 +1,7 @@
import { Argument, Constants } from 'discord-akairo';
-import { Guild, GuildPreview, MessageEmbed, Snowflake, Vanity } from 'discord.js';
+import { BaseGuildVoiceChannel, Guild, GuildPreview, MessageEmbed, Snowflake, Vanity } from 'discord.js';
import { BushCommand, BushMessage, BushSlashMessage } from '../../lib';
-// TODO: Implement regions and security
export default class GuildInfoCommand extends BushCommand {
public constructor() {
super('guildInfo', {
@@ -58,9 +57,9 @@ export default class GuildInfoCommand extends BushCommand {
const guild: Guild | GuildPreview = (args?.guild as Guild | GuildPreview) || (message.guild as Guild);
const emojis: string[] = [];
const guildAbout: string[] = [];
- // const guildSecurity = [];
- if (['516977525906341928', '784597260465995796', '717176538717749358', '767448775450820639'].includes(guild.id))
- emojis.push(client.consts.mappings.otherEmojis.BUSH_VERIFIED);
+ const guildSecurity = [];
+ const verifiedGuilds = Object.values(client.consts.mappings.guilds);
+ if (verifiedGuilds.includes(guild.id)) emojis.push(client.consts.mappings.otherEmojis.BUSH_VERIFIED);
if (!isPreview && guild instanceof Guild) {
if (guild.premiumTier) emojis.push(client.consts.mappings.otherEmojis['BOOST_' + guild.premiumTier]);
@@ -91,21 +90,29 @@ export default class GuildInfoCommand extends BushCommand {
.size.toLocaleString()}`
];
- // TODO add guild regions
- // const guildRegions = [];
+ const guildRegions = [];
+ guild.channels.cache.forEach((channel) => {
+ if (!channel.type.includes('VOICE')) return;
+ else if (!guildRegions.includes((channel as BaseGuildVoiceChannel).rtcRegion ?? 'automatic')) {
+ guildRegions.push((channel as BaseGuildVoiceChannel).rtcRegion ?? 'automatic');
+ }
+ });
guildAbout.push(
`**Owner:** ${guild.members.cache.get(guild.ownerId)?.user.tag}`,
- `**Created** ${guild.createdAt.toLocaleString()}`,
- `**Members:** ${guild.memberCount.toLocaleString()}`,
- `**Online:** ${guild.approximatePresenceCount?.toLocaleString()}`,
- `**Channels:** ${guild.channels.cache.size} (${channelTypes.join(', ')})`,
- `**Emojis:** ${guild.emojis.cache.size.toLocaleString()}`
- // `**Region:** ${guildRegions.join()}`
+ `**Created** ${guild.createdAt.toLocaleString()} (${util.dateDelta(guild.createdAt)})`,
+ `**Members:** ${guild.memberCount.toLocaleString() ?? 0}`,
+ `**Online:** ${guild.approximatePresenceCount?.toLocaleString() ?? 0}`,
+ `**Channels:** ${guild.channels.cache.size?.toLocaleString() ?? 0} (${channelTypes.join(', ')})`,
+ `**Emojis:** ${guild.emojis.cache.size?.toLocaleString() ?? 0}`,
+ `**Stickers:** ${guild.stickers.cache.size?.toLocaleString() ?? 0}`,
+ `**Regions:** ${guildRegions.map((region) => client.consts.mappings.regions[region] || region).join(', ')}`
);
if (guild.premiumSubscriptionCount)
guildAbout.push(
- `**Boosts:** Level ${guild.premiumTier.slice(0, 4)} with ${guild.premiumSubscriptionCount ?? 0} boosts`
+ `**Boosts:** Level ${guild.premiumTier == 'NONE' ? '0' : guild.premiumTier[5]} with ${
+ guild.premiumSubscriptionCount ?? 0
+ } boosts`
);
if (guild.me?.permissions.has('MANAGE_GUILD') && guild.vanityURLCode) {
const vanityInfo: Vanity = await guild.fetchVanityData();
@@ -115,12 +122,22 @@ export default class GuildInfoCommand extends BushCommand {
);
}
- // guildSecurity.push;
+ guildSecurity.push(
+ `**Verification Level**: ${guild.verificationLevel.toLowerCase().replace(/_/g, ' ')}`,
+ `**Explicit Content Filter:** ${guild.explicitContentFilter.toLowerCase().replace(/_/g, ' ')}`,
+ `**Default Message Notifications:** ${
+ typeof guild.defaultMessageNotifications === 'string'
+ ? guild.defaultMessageNotifications.toLowerCase().replace(/_/g, ' ')
+ : guild.defaultMessageNotifications
+ }`,
+ `**2FA Required**: ${guild.mfaLevel === 'ELEVATED' ? 'yes' : 'no'}`
+ );
} else {
guildAbout.push(
`**Members:** ${guild.approximateMemberCount?.toLocaleString()}`,
`**Online:** ${guild.approximatePresenceCount?.toLocaleString()}`,
- `**Emojis:** ${(guild as GuildPreview).emojis.size}`
+ `**Emojis:** ${(guild as GuildPreview).emojis.size?.toLocaleString() ?? 0}`
+ // `**Stickers:** ${(guild as GuildPreview).stickers.size}`
);
}
@@ -160,11 +177,11 @@ export default class GuildInfoCommand extends BushCommand {
if (guildIcon) {
guildInfoEmbed.setThumbnail(guildIcon);
}
- // if (!isPreview) {
- // guildInfoEmbed.addField('» Security', guildSecurity.join('\n'));
- // }
+ if (!isPreview) {
+ guildInfoEmbed.addField('» Security', guildSecurity.join('\n'));
+ }
if (emojis) {
- guildInfoEmbed.setDescription(emojis.join(' '));
+ guildInfoEmbed.setDescription('\u200B' /*zero width space*/ + emojis.join(' '));
}
return await message.util.reply({ embeds: [guildInfoEmbed] });
}
diff --git a/src/commands/info/userInfo.ts b/src/commands/info/userInfo.ts
index 87235a9..e36e92b 100644
--- a/src/commands/info/userInfo.ts
+++ b/src/commands/info/userInfo.ts
@@ -1,6 +1,5 @@
import { BushCommand, BushMessage, BushSlashMessage } from '@lib';
import { GuildMember, MessageEmbed } from 'discord.js';
-import moment from 'moment';
// TODO: Allow looking up a user not in the guild and not cached
// TODO: Re-Implement Status Emojis
@@ -78,11 +77,11 @@ export default class UserInfoCommand extends BushCommand {
if (user.premiumSinceTimestamp) emojis.push(client.consts.mappings.otherEmojis.BOOSTER);
const createdAt = user.user.createdAt.toLocaleString(),
- createdAtDelta = moment(moment(user.user.createdAt).diff(moment())).toLocaleString(),
+ createdAtDelta = util.dateDelta(user.user.createdAt),
joinedAt = user.joinedAt?.toLocaleString(),
- joinedAtDelta = moment(user.joinedAt)?.diff(moment()).toLocaleString(),
+ joinedAtDelta = util.dateDelta(user.joinedAt, 2),
premiumSince = user.premiumSince?.toLocaleString(),
- premiumSinceDelta = moment(user.premiumSince)?.diff(moment()).toLocaleString();
+ premiumSinceDelta = util.dateDelta(user.premiumSince, 2);
// General Info
const generalInfo = [
@@ -101,12 +100,12 @@ export default class UserInfoCommand extends BushCommand {
if (premiumSince) serverUserInfo.push(`**Boosting Since:** ${premiumSince} (${premiumSinceDelta} ago)`);
if (user.displayHexColor) serverUserInfo.push(`**Display Color:** ${user.displayHexColor}`);
if (user.id == '322862723090219008' && message.guild.id == client.consts.mappings.guilds.bush)
- serverUserInfo.push(`**General Deletions:** 2`);
+ serverUserInfo.push(`**General Deletions:** 1⅓`);
if (
['384620942577369088', '496409778822709251'].includes(user.id) &&
message.guild.id == client.consts.mappings.guilds.bush
)
- serverUserInfo.push(`**General Deletions:** 1`);
+ serverUserInfo.push(`**General Deletions:** ⅓`);
if (user.nickname) serverUserInfo.push(`**Nickname** ${user.nickname}`);
if (serverUserInfo.length)
userEmbed.addField('» Server Info', serverUserInfo.join('\n')).setColor(user.displayColor || util.colors.default);
@@ -128,10 +127,11 @@ export default class UserInfoCommand extends BushCommand {
if (user.presence.clientStatus) devices = Object.keys(user.presence.clientStatus);
const presenceInfo = [];
if (user.presence.status) presenceInfo.push(`**Status:** ${user.presence.status}`);
- if (devices) presenceInfo.push(`**${devices.length - 1 ? 'Devices' : 'Device'}:** ${util.oxford(devices, 'and', '')}`);
+ if (devices && devices.length)
+ presenceInfo.push(`**${devices.length - 1 ? 'Devices' : 'Device'}:** ${util.oxford(devices, 'and', '')}`);
if (activitiesNames.length)
presenceInfo.push(`**Activit${activitiesNames.length - 1 ? 'ies' : 'y'}:** ${util.oxford(activitiesNames, 'and', '')}`);
- if (customStatus) presenceInfo.push(`**Custom Status:** ${customStatus}`);
+ if (customStatus && customStatus.length) presenceInfo.push(`**Custom Status:** ${customStatus}`);
userEmbed.addField('» Presence', presenceInfo.join('\n'));
}
@@ -148,7 +148,7 @@ export default class UserInfoCommand extends BushCommand {
}
if (perms.length) userEmbed.addField('» Important Perms', perms.join(' '));
- if (emojis) userEmbed.setDescription('​' /*zero width space*/ + emojis.join(' '));
+ if (emojis) userEmbed.setDescription('\u200B' /*zero width space*/ + emojis.join(' '));
return await message.util.reply({ embeds: [userEmbed] });
}
diff --git a/src/commands/moderation/slowmode.ts b/src/commands/moderation/slowmode.ts
index f9ffbab..9b0d300 100644
--- a/src/commands/moderation/slowmode.ts
+++ b/src/commands/moderation/slowmode.ts
@@ -1,6 +1,6 @@
-import { BushCommand, BushMessage, BushSlashMessage } from '@lib';
-import { Argument, Constants } from 'discord-akairo';
-import { TextChannel, ThreadChannel } from 'discord.js';
+import { BushCommand, BushMessage, BushNewsChannel, BushSlashMessage, BushTextChannel, BushThreadChannel } from '@lib';
+import { Argument } from 'discord-akairo';
+import { NewsChannel, TextChannel, ThreadChannel } from 'discord.js';
export default class SlowModeCommand extends BushCommand {
public constructor() {
@@ -25,8 +25,7 @@ export default class SlowModeCommand extends BushCommand {
},
{
id: 'channel',
- type: Constants.ArgumentTypes.CHANNEL,
- match: Constants.ArgumentMatches.PHRASE,
+ type: 'channel',
prompt: {
start: 'What channel would you like to change?',
retry: '{error} Choose a valid channel.',
@@ -51,12 +50,18 @@ export default class SlowModeCommand extends BushCommand {
public async exec(
message: BushMessage | BushSlashMessage,
- { length, channel }: { length: number | 'off' | 'none' | 'disable'; channel: TextChannel | ThreadChannel }
+ {
+ length,
+ channel
+ }: {
+ length: number | 'off' | 'none' | 'disable';
+ channel: TextChannel | ThreadChannel | BushTextChannel | BushNewsChannel | BushThreadChannel | NewsChannel;
+ }
): Promise<unknown> {
if (message.channel.type === 'DM')
return await message.util.reply(`${util.emojis.error} This command cannot be run in dms.`);
- if (!channel) channel = message.channel as ThreadChannel | TextChannel;
- if (!(channel instanceof TextChannel) || !(channel instanceof ThreadChannel))
+ if (!channel) channel = message.channel;
+ if (!(channel instanceof TextChannel) && !(channel instanceof ThreadChannel))
return await message.util.reply(`${util.emojis.error} <#${channel.id}> is not a text or thread channel.`);
if (length) {
length =
diff --git a/src/commands/skyblock-reborn/chooseColorCommand.ts b/src/commands/skyblock-reborn/chooseColor.ts
index 0138e36..2b72301 100644
--- a/src/commands/skyblock-reborn/chooseColorCommand.ts
+++ b/src/commands/skyblock-reborn/chooseColor.ts
@@ -93,7 +93,7 @@ export default class ChooseColorCommand extends BushCommand {
args: [
{
id: 'color',
- type: Constants.ArgumentTypes.ROLE,
+ type: 'role',
match: Constants.ArgumentMatches.REST,
prompt: {
start: 'Please choose a valid color.',
@@ -102,7 +102,7 @@ export default class ChooseColorCommand extends BushCommand {
}
}
],
- clientPermissions: ['EMBED_LINKS', 'SEND_MESSAGES'],
+ clientPermissions: ['EMBED_LINKS', 'SEND_MESSAGES', 'MANAGE_ROLES'],
channel: 'guild',
restrictedGuilds: ['839287012409999391'],
slash: true,
diff --git a/src/lib/badlinks.json b/src/lib/badlinks.json
new file mode 100644
index 0000000..f010bc3
--- /dev/null
+++ b/src/lib/badlinks.json
@@ -0,0 +1,289 @@
+[
+ "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",
+ "aladdinhub.fun",
+ "allskinz.xyz",
+ "ano-skinspin.xyz",
+ "anomalyknifes.xyz",
+ "anomalyskin.xyz",
+ "anomalyskinz.xyz",
+ "anoskinzz.xyz",
+ "berrygamble.com",
+ "bitknife.xyz",
+ "bitskines.ru",
+ "challengeme.vip",
+ "challengeme.in",
+ "challengme.ru",
+ "cmepure.com",
+ "cmskillcup.com",
+ "counterpaid.xyz",
+ "counterspin.top",
+ "counterstrikegift.xyz",
+ "cs-beast.xyz",
+ "cs-lucky.xyz",
+ "cs-pill.xyz",
+ "cs-prizeskins.xyz",
+ "cs-prizeskinz.xyz",
+ "cs-simpleroll.xyz",
+ "cs-skinz.xyz",
+ "cs-smoke.xyz",
+ "cs-spinz.xyz",
+ "cs-victory.xyz",
+ "csallskin.xyz",
+ "csbuyskins.in",
+ "cscoat.eu",
+ "csgo-analyst.com",
+ "csgo-cash.eu",
+ "csgo-steamanalyst.net",
+ "csgo-swapskin.com",
+ "csgo-trade.net",
+ "csgo-up.com",
+ "csgobeats.com",
+ "csgocase.one",
+ "csgocashs.com",
+ "csgocheck.ru",
+ "csgocompetive.com",
+ "csgodetails.info",
+ "csgodreamer.com",
+ "csgodrs.com",
+ "csgoelite.xyz",
+ "csgoencup.com",
+ "csgoevent.xyz",
+ "csgoindex.ru",
+ "csgoitemdetails.com",
+ "csgoitemsprices.com",
+ "csgoko.tk",
+ "csgomarble.xyz",
+ "csgomarketplace.net",
+ "csgomarkets.net",
+ "csgoprocupgo.com",
+ "csgorcup.com",
+ "csgorose.com",
+ "csgoroyalskins1.com",
+ "csgoskill.ru",
+ "csgoskinprices.com",
+ "csgoskinsinfo.com",
+ "csgoskinsroll.com",
+ "csgosteamanalysis.com",
+ "csgosteamanalyst.ru",
+ "csgoteammate.gq",
+ "csgothunby.com",
+ "csgotrades.net",
+ "csgovip.ru",
+ "csgoxgiveaway.ru",
+ "csgozone.net.in",
+ "csgunskins.xyz",
+ "csmoneyskinz.xyz",
+ "csmvcecup.com",
+ "csprices.in",
+ "csskillpro.xyz",
+ "csskinz.xyz",
+ "cstournament.ru",
+ "csxrnoney.com",
+ "cybergamearena.ru",
+ "d2cups.com",
+ "d2faceit.com",
+ "deamonbets.ru",
+ "demonbets.ru",
+ "diablobets.com",
+ "doatgiveaway.top",
+ "dopeskins.com",
+ "dota2fight.ru",
+ "dota2fight.net",
+ "dota2giveaway.top",
+ "dota2giveaways.top",
+ "dotafights.vip",
+ "dotagiveaway.win",
+ "earnskinz.xyz",
+ "emeraldbets.ru",
+ "esportgaming.ru",
+ "event-games4roll.com",
+ "exchangeuritems.gq",
+ "extraskinscs.xyz",
+ "ezwin24.ru",
+ "faceiteasyleague.ru",
+ "fireopencase.com",
+ "free-skins.ru",
+ "game4roll.com",
+ "gameluck.ru",
+ "games-roll.ru",
+ "games-roll.ml",
+ "games-roll.ga",
+ "giveawayskin.com",
+ "global-skins.gq",
+ "globalcsskins.xyz",
+ "globalskins.tk",
+ "goldendota.com",
+ "goodskins.gq",
+ "gosteamanalyst.com",
+ "gtakey.ru",
+ "hellgiveaway.trade",
+ "hltvcsgo.com",
+ "hltvgames.net",
+ "knifespin.top",
+ "knifespin.xyz",
+ "knifespin.top",
+ "knifespins.xyz",
+ "knifez-roll.xyz",
+ "knifez-win.xyz",
+ "league-csgo.com",
+ "lehatop-01.ru",
+ "loungeztrade.com",
+ "lucky-skins.xyz",
+ "makson-gta.ru",
+ "maxskins.xyz",
+ "mvcsgo.com",
+ "mvpcup.ru",
+ "mvptournament.com",
+ "mygames4roll.com",
+ "night-skins.com",
+ "ownerbets.com",
+ "playerskinz.xyz",
+ "rangskins.com",
+ "roll-skins.ru",
+ "roll4knife.xyz",
+ "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",
+ "simple-knifez.xyz",
+ "simple-win.xyz",
+ "simplegamepro.ru",
+ "simpleroll-cs.xyz",
+ "simplespinz.xyz",
+ "simplewinz.xyz",
+ "skin-index.com",
+ "skin888trade.com",
+ "skincs-spin.xyz",
+ "skincs-spin.top",
+ "skinmarkets.net",
+ "skins-hub.top",
+ "skins-info.net",
+ "skins-jungle.xyz",
+ "skinsboost.ru",
+ "skinsdatabse.com",
+ "skinsind.com",
+ "skinsmind.ru",
+ "skinspace.ru",
+ "skinsplane.com",
+ "skinsplanes.com",
+ "skinsplanets.com",
+ "skinxmarket.site",
+ "skinz-spin.top",
+ "skinz-spin.xyz",
+ "skinzjar.ru",
+ "skinzprize.xyz",
+ "skinzspin-cs.xyz",
+ "skinzspinz.xyz",
+ "spin-games.com",
+ "spin4skinzcs.top",
+ "spin4skinzcs.xyz",
+ "spinforskin.ml",
+ "sponsored-simple.xyz",
+ "staffstatsgo.com",
+ "starrygamble.com",
+ "stat-csgo.ru",
+ "stats-cs.ru",
+ "steam-analyst.ru",
+ "steamanalysts.com",
+ "steamgamesroll.ru",
+ "stewie2k-giveaway-150days.pro",
+ "sunnygamble.com",
+ "swapskins.live",
+ "test-domuin2.com",
+ "test-domuin3.ru",
+ "test-domuin4.ru",
+ "test-domuin5.ru",
+ "tournamentt.com",
+ "waterbets.ru",
+ "ultimateskins.xyz",
+ "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"
+]
diff --git a/src/lib/badwords.json b/src/lib/badwords.json
new file mode 100644
index 0000000..94c854f
--- /dev/null
+++ b/src/lib/badwords.json
@@ -0,0 +1,15 @@
+{
+ "nigger": 3,
+ "nigga": 3,
+ "retard": 2,
+ "retarted": 2,
+ "faggot": 2,
+ "slut": 1,
+ "whore": 1,
+ "卍": 3,
+ "found a cool software that improves the": 3,
+ "hi, bro h am leaving cs:go and giving away my skin": 3,
+ "hi friend, today i am leaving this fucking game": 3,
+ "hi guys, i'm leaving this fucking game, take my": 3,
+ "you can choose any skin for yourself": 3
+}
diff --git a/src/lib/extensions/discord-akairo/BushClient.ts b/src/lib/extensions/discord-akairo/BushClient.ts
index 10db18d..54b5250 100644
--- a/src/lib/extensions/discord-akairo/BushClient.ts
+++ b/src/lib/extensions/discord-akairo/BushClient.ts
@@ -1,6 +1,7 @@
import chalk from 'chalk';
import { AkairoClient } from 'discord-akairo';
import {
+ Collection,
Guild,
Intents,
InteractionReplyOptions,
@@ -31,6 +32,7 @@ import { BushCache } from '../../utils/BushCache';
import { BushConstants } from '../../utils/BushConstants';
import { BushLogger } from '../../utils/BushLogger';
import { Config } from '../../utils/Config';
+import { BushApplicationCommand } from '../discord.js/BushApplicationCommand';
import { BushButtonInteraction } from '../discord.js/BushButtonInteraction';
import { BushCategoryChannel } from '../discord.js/BushCategoryChannel';
import { BushCommandInteraction } from '../discord.js/BushCommandInteraction';
@@ -42,6 +44,7 @@ import { BushMessage } from '../discord.js/BushMessage';
import { BushMessageReaction } from '../discord.js/BushMessageReaction';
import { BushNewsChannel } from '../discord.js/BushNewsChannel';
import { BushPresence } from '../discord.js/BushPresence';
+import { BushReactionEmoji } from '../discord.js/BushReactionEmoji';
import { BushRole } from '../discord.js/BushRole';
import { BushSelectMenuInteraction } from '../discord.js/BushSelectMenuInteraction';
import { BushStoreChannel } from '../discord.js/BushStoreChannel';
@@ -66,6 +69,15 @@ export type BushThreadMemberResolvable = BushThreadMember | BushUserResolvable;
export type BushUserResolvable = BushUser | Snowflake | BushMessage | BushGuildMember | BushThreadMember;
export type BushGuildMemberResolvable = BushGuildMember | BushUserResolvable;
export type BushRoleResolvable = BushRole | Snowflake;
+export type BushMessageResolvable = BushMessage | Snowflake;
+export type BushEmojiResolvable = Snowflake | BushGuildEmoji | BushReactionEmoji;
+export type BushEmojiIdentifierResolvable = string | BushEmojiResolvable;
+export type BushThreadChannelResolvable = BushThreadChannel | Snowflake;
+export type BushApplicationCommandResolvable = BushApplicationCommand | Snowflake;
+export interface BushFetchedThreads {
+ threads: Collection<Snowflake, BushThreadChannel>;
+ hasMore?: boolean;
+}
const rl = readline.createInterface({
input: process.stdin,
diff --git a/src/lib/extensions/discord-akairo/BushClientUtil.ts b/src/lib/extensions/discord-akairo/BushClientUtil.ts
index ebac9eb..926a529 100644
--- a/src/lib/extensions/discord-akairo/BushClientUtil.ts
+++ b/src/lib/extensions/discord-akairo/BushClientUtil.ts
@@ -38,7 +38,10 @@ import {
} from 'discord.js';
import got from 'got';
import humanizeDuration from 'humanize-duration';
+import moment from 'moment';
import { inspect, InspectOptions, promisify } from 'util';
+import _badLinks from '../../badlinks.json'; // Stolen from https://github.com/nacrt/SkyblockClient-REPO/blob/main/files/scamlinks.json
+import badWords from '../../badwords.json';
import { ActivePunishment, ActivePunishmentType } from '../../models/ActivePunishment';
import { BushNewsChannel } from '../discord.js/BushNewsChannel';
import { BushTextChannel } from '../discord.js/BushTextChannel';
@@ -752,8 +755,13 @@ export class BushClientUtil extends ClientUtil {
return typeMap[type];
}
- public humanizeDuration(duration: number): string {
- return humanizeDuration(duration, { language: 'en', maxDecimalPoints: 2 });
+ public humanizeDuration(duration: number, largest?: number): string {
+ if (largest) return humanizeDuration(duration, { language: 'en', maxDecimalPoints: 2, largest });
+ else return humanizeDuration(duration, { language: 'en', maxDecimalPoints: 2 });
+ }
+
+ public dateDelta(date: Date, largest?: number) {
+ return this.humanizeDuration(moment(date).diff(moment()), largest ?? 3);
}
public async findUUID(player: string): Promise<string> {
@@ -790,8 +798,78 @@ export class BushClientUtil extends ClientUtil {
/* eslint-enable @typescript-eslint/no-unused-vars */
public async automod(message: BushMessage) {
- const autoModPhases = await message.guild.getSetting('autoModPhases');
- if (autoModPhases.includes(message.content.toString()) && message.deletable) return await message.delete();
+ if (message.guild.id !== client.consts.mappings.guilds.bush) return; // just temporary
+ /* await message.guild.getSetting('autoModPhases'); */
+ const badLinks = _badLin