fix: Reply for compact mode

Author: dev-737

src/Events/messageCreate.ts

@@ -1,3 +1,4 @@
+import modifers from '../Scripts/message/messageContentModifiers';
 import evalScript from '../Scripts/message/evalScript';
 import messageSendTypes from '../Scripts/message/messageTypes';
 import { EmbedBuilder, GuildMember, Message, User } from 'discord.js';
@@ -27,9 +28,14 @@ export const usersMap = new Map<string, UserEntries>();
 export const blacklistsMap = new Map<string, BlacklistEntries>();
 export const warningsMap = new Map<string, WarningEntries>();
 
+export interface MessageInterface extends Message<boolean>{
+	compactMessage?: string,
+	uncensoredCompactMessage?: string,
+}
+
 export default {
 	name: 'messageCreate',
-	async execute(message: Message) {
+	async execute(message: MessageInterface) {
 		if (message.author.bot || blacklistsMap.has(message.author.id)) return;
 
 		if (message.content.startsWith('c!eval')) evalScript.execute(message);
@@ -48,17 +54,6 @@ export default {
 			const checks = await require('../Scripts/message/checks').execute(message, database);
 			if (!checks) return;
 
-			if (message.reference) {
-				const referredMessage = await message.fetchReference();
-				if (
-					referredMessage.author.id === message.client.user.id &&
-					referredMessage.embeds[0] &&
-					referredMessage.embeds[0].fields?.length > 0
-				) {
-					message.content = `> ${referredMessage.embeds[0].fields[0].value}\n${message.content}`;
-				}
-			}
-
 			const embed = new EmbedBuilder()
 				.setTimestamp()
 				.setColor(colors())
@@ -73,17 +68,38 @@ export default {
 					iconURL: message.guild?.iconURL()?.toString(),
 				});
 
-			await require('../Scripts/message/addBadges').execute(message, database, embed);
+			message.compactMessage = `**${message.author.tag}:** ${message.content}`;
+
+			if (message.reference) {
+				const messageReferred = await message.fetchReference().catch(() => null);
+				const messageInDb = await messageData?.findOne({ channelAndMessageIds: { $elemMatch: { messageId: messageReferred?.id } } });
 
-			const modifers = require('../Scripts/message/messageContentModifiers').default;
+				if (messageInDb && messageReferred) {
+					let embedMessage = messageReferred.embeds[0]?.fields[0]?.value;
+					const embedFieldName = messageReferred.embeds[0]?.fields[0]?.name;
+
+					const compactReferrence = messageReferred.content;
+
+					if (embedFieldName?.includes('Reply Message') && embedMessage) embedMessage = embedMessage?.split(/> .*/g)[1].trimStart();
+
+					message.content = embedMessage ? `> ${embedMessage}\n${message.content}` : compactReferrence ? `> ${compactReferrence}\n${message.content}` : message.content;
+					message.compactMessage = embedMessage ? `> ${embedMessage}\n` + message.compactMessage : compactReferrence ? `> ${compactReferrence}\n` + message.compactMessage : message.content;
+
+					embed.spliceFields(0, 1, {
+						name: 'Reply Message',
+						value: message.content,
+					});
+				}
+			}
+
+
+			await require('../Scripts/message/addBadges').execute(message, database, embed);
 			const attachments = await modifers.attachmentModifiers(message, embed);
 
-			// this embed remains untouched and is not changed in embedModifers
-			// required for profanity toggle
 			const uncensoredEmbed = new EmbedBuilder(embed.data);
+			message.uncensoredCompactMessage = message.compactMessage;
 
-			// call this function after uncensoredEmbed is created or it will be modified
-			await modifers.embedModifers(embed);
+			await modifers.profanityCensor(embed, message); // FIXME: Does not work for compact messages
 
 			// leveling system
 			// FIXME: Add levelling back when ready

src/Scripts/message/messageContentModifiers.ts

@@ -2,7 +2,7 @@ import fetch from 'node-fetch';
 import logger from '../../Utils/logger';
 import { AttachmentBuilder, EmbedBuilder, Message } from 'discord.js';
 import wordFilter from '../../Utils/functions/wordFilter';
-
+import { MessageInterface } from '../../Events/messageCreate';
 import 'dotenv/config';
 
 export default {
@@ -54,10 +54,14 @@ export default {
 		}
 	},
 
-	async embedModifers(embed: EmbedBuilder) {
+	async profanityCensor(embed: EmbedBuilder, message: MessageInterface) {
 		// check if message contains profanity and censor it if it does
 		if (wordFilter.check(embed.data.fields?.at(0)?.value)) {
 			embed.setFields({ name: 'Message', value: wordFilter.censor(String(embed.data.fields?.at(0)?.value)) });
 		}
+
+		if (wordFilter.check(message.compactMessage)) {
+			message.compactMessage = wordFilter.censor(String(message.compactMessage));
+		}
 	},
 };

src/Scripts/message/messageTypes.ts

@@ -1,9 +1,9 @@
-import { EmbedBuilder, AttachmentBuilder, Message, TextChannel, MessageMentionTypes, BaseMessageOptions } from 'discord.js';
+import { EmbedBuilder, AttachmentBuilder, TextChannel, MessageMentionTypes, BaseMessageOptions } from 'discord.js';
 import { Collection } from 'mongodb';
+import { MessageInterface } from '../../Events/messageCreate';
 import { connectedListDocument, setupDocument } from '../../Utils/typings/types';
 
 interface WebhookMessageInterface extends BaseMessageOptions {
-	content: string,
 	username: string,
 	files?: AttachmentBuilder[],
 	avatarURL: string,
@@ -16,20 +16,23 @@ export default {
 	 *
 	 * @param uncensoredEmbed An embed with the original message content. (uncensored)
 	 */
-	execute: async (message: Message, channelObj: connectedListDocument, embed: EmbedBuilder, uncensoredEmbed: EmbedBuilder, setupDb?: Collection, attachments?: AttachmentBuilder) => {
+	execute: async (message: MessageInterface, channelObj: connectedListDocument, embed: EmbedBuilder, uncensoredEmbed: EmbedBuilder, setupDb?: Collection, attachments?: AttachmentBuilder) => {
 		const allChannel = message.client.channels.cache.get(channelObj.channelId) as TextChannel;
 
 		if (!allChannel) return { unknownChannelId: channelObj.channelId };
 
 		const channelInDB = await setupDb?.findOne({ 'channel.id': allChannel.id }) as setupDocument | null | undefined;
 
-		if (!channelInDB?.profFilter) embed = uncensoredEmbed;
+		if (!channelInDB?.profFilter) {
+			message.compactMessage = String(message.uncensoredCompactMessage);
+			embed = uncensoredEmbed;
+		}
 
 		if (channelInDB?.compact === true && allChannel.id == message.channel.id) {
-			return webhookAutomate(message.channel as TextChannel);
+			return sendCompact(message.channel as TextChannel);
 		}
 		else if (channelInDB?.compact === true && allChannel.id == channelInDB.channel.id) {
-			return webhookAutomate(allChannel);
+			return sendCompact(allChannel);
 		}
 		// TODO: Make sending images a voter only feature, so that random people won't send inappropriate images
 		else if (attachments) {
@@ -41,16 +44,16 @@ export default {
 		}
 
 
-		async function webhookAutomate(chan: TextChannel) {
+		async function sendCompact(chan: TextChannel) {
 			const webhookMessage: WebhookMessageInterface = {
-				content: message.content,
+				content: message.compactMessage,
 				username: message.author.username,
 				avatarURL: String(message.author.avatarURL()),
 				allowedMentions: { parse: [] },
 			};
 
 			const normalMessage: BaseMessageOptions = {
-				content: `**${message.author.tag}:** ${message.content}`,
+				content: message.compactMessage,
 				allowedMentions: { parse: [] },
 			};