Merge branch 'costumer_mimic' of https://github.com/Pyra-Tech/Gagbot into costumer_mimic

Author: Pyra-Tech

commands/list.js

@@ -38,15 +38,15 @@ async function generateList(listchoice, page, details) {
 		// Page Down
 		new ButtonBuilder()
 			.setCustomId(`list_pagedown_${listchoice}_${page}_${details}`)
-			.setLabel("⮜ Prev Page")
+			.setLabel("← Prev Page")
 			.setStyle(ButtonStyle.Secondary)
 			.setDisabled(page <= 1),
 		// Current Page
 		new ButtonBuilder().setCustomId(`list_none_${listchoice}_${page}_${details}`).setLabel(`Page ${page} of ${maxpages}`).setStyle(ButtonStyle.Secondary),
 		// Page Up
 		new ButtonBuilder()
 			.setCustomId(`list_pageup_${listchoice}_${page}_${details}`)
-			.setLabel("Next Page ⮞")
+			.setLabel("Next Page →")
 			.setStyle(ButtonStyle.Secondary)
 			.setDisabled(page >= maxpages),
 	];

functions/gagfunctions.js

@@ -460,10 +460,16 @@ function textGarbleGag(messagein, msg, modifiedmessage, outtextin) {
 				let gaggarble = require(path.join(commandsPath, `${gag.gagtype}.js`));
 				let intensity = gag.intensity ? gag.intensity : 5;
 				if (gaggarble.messagebegin) {
-					msgpartsbegin.push(gaggarble.messagebegin(msg.content, intensity));
+					let out = gaggarble.messagebegin(msg.content, intensity, msgparts);
+					if (typeof out == "string") {
+						msgpartsbegin.push(out);
+					} else {
+						// Do further changes here I guess if necessary.
+						msgparts = out.msgparts;
+					}
 				}
 				for (let i = 0; i < msgparts.length; i++) {
-					if (msgparts[i].garble) {
+					if (msgparts[i].garble && gaggarble.garbleText) {
 						let garbled = gaggarble.garbleText(msgparts[i].text, intensity);
 						if (typeof garbled == "string") {
 							msgparts[i].text = garbled;

gags/politeSub.js

@@ -1,4 +1,4 @@
-const garbleText = (text, intensity) => {
+const messagebegin = (msgcontent, intensity, msgparts) => {
 	let honorifictitles = [
 		// Oh god its hard to type these without caps
 		"miss",
@@ -37,6 +37,10 @@ const garbleText = (text, intensity) => {
 		"dame",
 		"count",
 		"overlord",
+		"(\\w|\\d)+-sama",
+		"(\\w|\\d)+-sensei",
+		"(\\w|\\d)+-san",
+		"(\\w|\\d)+-kun",
 	];
 
 	let silenttitles = [`\n*looks down silently*\n`, `\n*tries to speak, but no words come out*\n`, `\n*nods without a word*\n`, `\n*looks down and to the side*\n`, `\n*twiddles thumbs meekly*\n`, `\n*pouts as the gag stops impolite speech*\n`, `\n*goes mute without an honorific*\n`, `\n*meeps but produces no audible words*\n`, `\n*casts eyes downward, like a good sub*\n`, `\n*blushes and mumbles something*\n`];
@@ -47,13 +51,27 @@ const garbleText = (text, intensity) => {
 	let honorificsmap = honorifictitles.join("|");
 	let regexpattern = new RegExp(`\\b(${honorificsmap})\\b`, "i");
 
-	if (regexpattern.test(text)) {
-		textout = text;
-		garblemode = true;
+	if (regexpattern.test(msgcontent)) {
+		// They were polite, don't touch it.
+		return { msgparts: msgparts };
+	} else {
+		let msgpartschanged = msgparts.slice(0);
+		let silented = false;
+		for (let i = 0; i < msgpartschanged.length; i++) {
+			// Twiddle their thumbs
+			if (!silented && msgpartschanged[i].garble) {
+				msgpartschanged[i].text = silenttitles[Math.floor(Math.random() * silenttitles.length)];
+				silented = true;
+			}
+			// Theyve been silenced, no more speech.
+			else if (msgpartschanged[i].garble) {
+				msgpartschanged[i].text = "";
+			}
+		}
+		return { msgparts: msgpartschanged };
 	}
-
-	return { text: textout, garble: garblemode };
 };
 
-exports.garbleText = garbleText;
+//exports.garbleText = garbleText;
+exports.messagebegin = messagebegin;
 exports.choicename = "Polite Sub Gag";

gags/soap.js

@@ -0,0 +1,12 @@
+const garbleText = (text, intensity) => {
+	let curses = ["fuck", "fucking", "fuckin", "motherfucker", "damn", "dammit", "bitch", "shit", "bitchin'", "ass", "asshole", "arse", "goddammit", "piss", "dick", "dickhead", "damned", "bullshit", "fucked", "fucker", "crap", "hell", "cunt", "bollocks", "slut", "sluts", "idiot"];
+
+	let cursemap = curses.join("|");
+	let regexpattern = new RegExp(`\\b(${cursemap})\\b`, "gi");
+	let textout = text.replaceAll(regexpattern, "🧼".repeat(Math.floor(intensity / 2)));
+
+	return { text: textout, garble: true };
+};
+
+exports.garbleText = garbleText;
+exports.choicename = "Soap Gag";