Merge branch 'master' of https://github.com/NotEnoughUpdates/bush-bot

4 files changed, 67 insertions, 2 deletions

diff --git a/src/commands/config/features.ts b/src/commands/config/features.ts
index d0f9c5c..095d985 100644
--- a/src/commands/config/features.ts
+++ b/src/commands/config/features.ts
@@ -81,7 +81,7 @@ export default class FeaturesCommand extends BushCommand {
 				customId: 'command_selectFeature',
 				disabled: disable,
 				maxValues: 1,
-				minValues: 2,
+				minValues: 1,
 				options: guildFeatures.map((f) => ({
 					label: guildFeaturesObj[f].name,
 					value: f,
diff --git a/src/commands/moulberry-bush/rule.ts b/src/commands/moulberry-bush/rule.ts
index fb322ff..d4820fe 100644
--- a/src/commands/moulberry-bush/rule.ts
+++ b/src/commands/moulberry-bush/rule.ts
@@ -15,7 +15,7 @@ const rules = [
 	{
 		title: '3.) No Spamming',
 		description:
-			'Including but not limited to: any messages that do not contribute to the conversation, repeated messages, randomly tagging users, and chat flood.'
+			'Including but not limited to: any messages that do not contribute to the conversation, repeated messages, linebreaking, randomly tagging users, and chat flood.'
 	},
 	{
 		title: '4.) English',
diff --git a/src/lib/badlinks.ts b/src/lib/badlinks.ts
index c79f08d..75fafa4 100644
--- a/src/lib/badlinks.ts
+++ b/src/lib/badlinks.ts
@@ -570,6 +570,7 @@ export default [
 	"dicsord.space",
 	"dicsord.website",
 	"dicsordapp.co",
+	"dicsordgift.club",
 	"dicsordgift.com",
 	"dicsordgive.ru.com",
 	"dicsordnitro.info",
@@ -615,8 +616,10 @@ export default [
 	"discard.xyz",
 	"discardapp.fun",
 	"disccor.com",
+	"disccord-apps.com",
 	"disccord.gg",
 	"disccord.ru.com",
+	"disccord.ru",
 	"disccord.shop",
 	"disccord.tk",
 	"disccords.com",
@@ -688,6 +691,7 @@ export default [
 	"discorb.gifts",
 	"discorb.ru.com",
 	"discorc-nitro.site",
+	"discorcd-apps.com",
 	"discorcd-gift.com",
 	"discorcd-nitro.com",
 	"discorcd.click",
@@ -702,6 +706,7 @@ export default [
 	"discorcl-app.ru",
 	"discorcl-app.xyz",
 	"discorcl-boost.ru",
+	"discorcl-gift.org.ru",
 	"discorcl-gift.ru.com",
 	"discorcl-gift.ru",
 	"discorcl-gift.xyz",
@@ -793,6 +798,7 @@ export default [
 	"discord-claim.com",
 	"discord-claim.ru.com",
 	"discord-claim.ru",
+	"discord-clap.com",
 	"discord-click.shop",
 	"discord-club.ru",
 	"discord-com-free.online",
@@ -825,6 +831,7 @@ export default [
 	"discord-generator.tk",
 	"discord-get.click",
 	"discord-get.ru",
+	"discord-gg.com",
 	"discord-gif.xyz",
 	"discord-gift-free-nitro.tk",
 	"discord-gift-nitro.site",
@@ -906,10 +913,12 @@ export default [
 	"discord-net-labs.com",
 	"discord-netro.ru",
 	"discord-news.com",
+	"discord-niittro.ru",
 	"discord-nilro.ru",
 	"discord-niltro.com",
 	"discord-niltro.ru.com",
 	"discord-nitr0gift.fun",
+	"discord-nitro-boost.xyz",
 	"discord-nitro-free.ml",
 	"discord-nitro-free.ru",
 	"discord-nitro-free.xyz",
@@ -1144,6 +1153,8 @@ export default [
 	"discordf.gift",
 	"discordfree.com",
 	"discordfrnitro.site",
+	"discordg.com.ru",
+	"discordg.link",
 	"discordgame.com",
 	"discordgamers.co.uk",
 	"discordgg.com",
@@ -1393,6 +1404,7 @@ export default [
 	"discrod-app.site",
 	"discrod-apps.ru",
 	"discrod-gift.com",
+	"discrod-gifte.com",
 	"discrod-glfts.com",
 	"discrod-nitro.fun",
 	"discrod-nitro.info",
@@ -1433,6 +1445,7 @@ export default [
 	"disocrd.gifts",
 	"disocrd.me",
 	"disocrd.org",
+	"disocrd.ru",
 	"disocrd.tk",
 	"disocrdapp.com",
 	"disorc.com",
@@ -1491,6 +1504,7 @@ export default [
 	"dliscord-glft.ru.com",
 	"dliscord-nitro.com",
 	"dliscord.com",
+	"dliscord.gift",
 	"dliscord.us",
 	"dliscordl.com",
 	"dliscordnltro.com",
@@ -1498,6 +1512,7 @@ export default [
 	"dliscrd.one",
 	"dllscord.online",
 	"dlscard.ru",
+	"dlsccord-apps.club",
 	"dlsccrd.com",
 	"dlscocrd.club",
 	"dlscocrd.com",
@@ -1530,6 +1545,7 @@ export default [
 	"dlscord-glft.pw",
 	"dlscord-glft.ru.com",
 	"dlscord-glft.xyz",
+	"dlscord-glfts.xyz",
 	"dlscord-halloween.ru",
 	"dlscord-hypesquad.com",
 	"dlscord-hypesquads.com",
@@ -1589,6 +1605,7 @@ export default [
 	"dlscordapps.com",
 	"dlscordboost.com",
 	"dlscordd.ru",
+	"dlscordfull.ru",
 	"dlscordgift.com",
 	"dlscordgift.shop",
 	"dlscordgived.xyz",
@@ -1606,6 +1623,7 @@ export default [
 	"dlscordnltro.ru",
 	"dlscords.gifts",
 	"dlscords.site",
+	"dlscordsgift.xyz",
 	"dlscordsglfts.xyz",
 	"dlscordsream.pp.ua",
 	"dlscordsteam.com",
@@ -1615,6 +1633,7 @@ export default [
 	"dlscrod-app.xyz",
 	"dlscrod.ru.com",
 	"dlscrodapp.ru",
+	"dlsordnitro.gifts",
 	"dmarkef.com",
 	"dmarket-place.pp.ua",
 	"dmcordsteamnitro.de",
@@ -1888,6 +1907,7 @@ export default [
 	"forsportss.pp.ua",
 	"fortnight.space",
 	"fortnite-newswapper.fun",
+	"fortnite.sswapper.com",
 	"fortnitebuy.com",
 	"fortnitecrew.ru.com",
 	"fortniteswapper.fun",
@@ -5115,6 +5135,7 @@ export default [
 	"stearncommnuinty.com",
 	"stearncommnuity.ru.com",
 	"stearncommnunity.ru.com",
+	"stearncommonity.ru",
 	"stearncommrunity.com",
 	"stearncommubity.com",
 	"stearncommuinuty.co",
@@ -5232,9 +5253,11 @@ export default [
 	"stearncornmunity.net",
 	"stearncornmunity.ru.com",
 	"stearncornmunity.ru",
+	"stearncornmunlty.ru",
 	"stearncornmunuty.ru",
 	"stearncornmurnity.ru.com",
 	"stearncornnumyty.com",
+	"stearncornnunity.ru",
 	"stearncornrnnity.ru.com",
 	"stearncornrnuity.com",
 	"stearncornrnunity.com",
diff --git a/src/lib/badwords.ts b/src/lib/badwords.ts
index cab7cec..df984f6 100644
--- a/src/lib/badwords.ts
+++ b/src/lib/badwords.ts
@@ -163,6 +163,20 @@ export default {
 		reason: "steam scam phrase",
 		regex: false,
 	},
+	"Hey, I'm leaving for the army and giving the skins": {
+		severity: Severity.PERM_MUTE,
+		ignoreSpaces: true,
+		ignoreCapitalization: true,
+		reason: "steam scam phrase",
+		regex: false,
+	},
+	"fuck this trash called CS:GO, deleted,": {
+		severity: Severity.PERM_MUTE,
+		ignoreSpaces: true,
+		ignoreCapitalization: true,
+		reason: "steam scam phrase",
+		regex: false,
+	},
 
 	/* -------------------------------------------------------------------------- */
 	/*                                 Nitro Scams                                */
@@ -358,6 +372,34 @@ export default {
 		reason: "discord nitro scam phrase",
 		regex: false,
 	},
+	"Free discord nitro for 1 month!": {
+		severity: Severity.PERM_MUTE,
+		ignoreSpaces: true,
+		ignoreCapitalization: true,
+		reason: "discord nitro scam phrase",
+		regex: false,
+	},
+	"Hey, I got some nitro left over here": {
+		severity: Severity.PERM_MUTE,
+		ignoreSpaces: true,
+		ignoreCapitalization: true,
+		reason: "discord nitro scam phrase",
+		regex: false,
+	},
+	"Hey, steam gived nitro": {
+		severity: Severity.PERM_MUTE,
+		ignoreSpaces: true,
+		ignoreCapitalization: true,
+		reason: "discord nitro scam phrase",
+		regex: false,
+	},
+	"nitro giveaway by steam, take it": {
+		severity: Severity.PERM_MUTE,
+		ignoreSpaces: true,
+		ignoreCapitalization: true,
+		reason: "discord nitro scam phrase",
+		regex: false,
+	},
 
 	/* -------------------------------------------------------------------------- */
 	/*                                 Misc Scams                                 */