Refactoring

src/attemptSendUserMessage.ts

@@ -1,15 +0,0 @@
-import { TextChannel, type Message } from "discord.js";
-
-export default function attemptSendAuthorMessage(message: Message): void {
-	if (!(message.channel instanceof TextChannel)) return;
-	if (!message.guild) return;
-
-	message.author
-		.send(
-			`Hey! [__O link que voce mandou__](<${message.content}>) no canal "_${message.channel.name}_" do servidor "_${message.guild.name}_" ja foi mandado no passado!
-A mensagem que voce mandou foi apagada para evitar que os chatos comentem "repost".
-De nada!`,
-		)
-		.then()
-		.catch((_) => null);
-}

src/bot.ts

@@ -1,37 +1,26 @@
 import { Client, Events, GatewayIntentBits } from "discord.js";
 import type { Message } from "discord.js";
-import { readyHandler } from "./ready.ts";
+import { readyHandler } from "./functions/ready.ts";
-import feedMessagesArray from "./feedMessagesArray.ts";
+import feedMessagesArray from "./functions/feedMessagesArray.ts";
-import updateMessagesArray from "./updateMessagesArray.ts";
+import handleMessageReposts from "./functions/handleMessageReposts.ts";
-import checkForReposts from "./checkForReposts.ts";
-import attemptSendAuthorMessage from "./attemptSendUserMessage.ts";
 
 const client = new Client({
-	intents: [
+  intents: [
-		GatewayIntentBits.Guilds,
+    GatewayIntentBits.Guilds,
-		GatewayIntentBits.GuildMessages,
+    GatewayIntentBits.GuildMessages,
-		GatewayIntentBits.MessageContent,
+    GatewayIntentBits.MessageContent,
-	],
+  ],
 });
 
 let messagesArr: Message[];
 
 client.once(Events.ClientReady, async (client) => {
-	readyHandler(client);
+  readyHandler(client);
-	messagesArr = await feedMessagesArray(client);
+  messagesArr = await feedMessagesArray(client);
 });
 
 client.on(Events.MessageCreate, async (message) => {
-	console.log(message);
+  messagesArr = handleMessageReposts(messagesArr, message);
-	const originalMessages = checkForReposts(messagesArr, message);
-	console.log(originalMessages);
-
-	if (originalMessages.length >= 1) {
-		message.delete();
-		attemptSendAuthorMessage(message);
-	} else {
-		messagesArr = updateMessagesArray(messagesArr, message);
-	}
 });
 
 // // TODO, updateMessagesArray on message deletion

src/checkForReposts.ts

@@ -1,22 +0,0 @@
-import type { Message } from "discord.js";
-import { clearUrl } from "./utils/url.ts";
-import { transformMessageArrayInMap } from "./utils/message.ts";
-
-export default function checkForReposts(
-	messagesArray: Message[],
-	newMessage: Message,
-): Message[] {
-	const urlMessagesMap = transformMessageArrayInMap(messagesArray);
-
-	const newMessageClearedUrl = clearUrl(newMessage.content);
-
-	if (!newMessageClearedUrl) return [];
-
-	const urlMessagesMatchArray = urlMessagesMap.get(newMessageClearedUrl);
-
-	if (!urlMessagesMatchArray) return [];
-
-	if (urlMessagesMatchArray.length > 1) return urlMessagesMatchArray;
-
-	return [];
-}

src/checkMessagesArrayForReposts.ts

@@ -1,33 +0,0 @@
-import type { Message } from "discord.js";
-import type MessageInfoWithReposts from "./interfaces/MessageInfoWithReposts.ts";
-import { transformMessageArrayInMap } from "./utils/message.ts";
-
-export default function checkMessagesArrayForReposts(
-	messagesArray: Message[],
-): Map<string, MessageInfoWithReposts> {
-	const urlMessagesMap = transformMessageArrayInMap(messagesArray);
-
-	const messageInfoWithRepostsMap = new Map<string, MessageInfoWithReposts>();
-
-	for (const [url, messagesMentioningUrlArray] of urlMessagesMap) {
-		if (messagesMentioningUrlArray.length === 1) continue;
-
-		const originalMessage = messagesMentioningUrlArray.reduce((prev, curr) =>
-			prev.createdTimestamp < curr.createdTimestamp ? prev : curr,
-		);
-
-		const messageInfoWithRepostsMapPosition =
-			messageInfoWithRepostsMap.get(url);
-
-		if (!messageInfoWithRepostsMapPosition) {
-			messageInfoWithRepostsMap.set(url, {
-				originalMessage,
-				repetitions: messagesMentioningUrlArray.filter(
-					(elm) => elm !== originalMessage,
-				),
-			});
-		}
-	}
-
-	return messageInfoWithRepostsMap;
-}

src/functions/attemptSendUserMessage.ts

@@ -0,0 +1,15 @@
+import { TextChannel, type Message } from "discord.js";
+
+export default function attemptSendAuthorMessage(authorMessage: Message): void {
+  if (!(authorMessage.channel instanceof TextChannel)) return;
+  if (!authorMessage.guild) return;
+
+  authorMessage.author
+    .send(
+      `Hey! [__O link que voce mandou__](<${authorMessage.content}>) no canal "_${authorMessage.channel.name}_" do servidor "_${authorMessage.guild.name}_" ja foi mandado no passado!
+A mensagem que voce mandou foi apagada para evitar que os chatos comentem "repost".
+De nada!`,
+    )
+    .then()
+    .catch((_) => null);
+}

src/functions/checkMessagesArrayReposts.ts

@@ -0,0 +1,33 @@
+import type { Message } from "discord.js";
+import type MessageInfoWithReposts from "../interfaces/MessageInfoWithReposts.ts";
+import { transformMessageArrayInMap } from "../utils/message.ts";
+
+export default function checkMessagesArrayForReposts(
+  messagesArray: Message[],
+): Map<string, MessageInfoWithReposts> {
+  const urlMessagesMap = transformMessageArrayInMap(messagesArray);
+
+  const messageInfoWithRepostsMap = new Map<string, MessageInfoWithReposts>();
+
+  for (const [url, messagesMentioningUrlArray] of urlMessagesMap) {
+    if (messagesMentioningUrlArray.length === 1) continue;
+
+    const originalMessage = messagesMentioningUrlArray.reduce((prev, curr) =>
+      prev.createdTimestamp < curr.createdTimestamp ? prev : curr,
+    );
+
+    const messageInfoWithRepostsMapPosition =
+      messageInfoWithRepostsMap.get(url);
+
+    if (!messageInfoWithRepostsMapPosition) {
+      messageInfoWithRepostsMap.set(url, {
+        originalMessage,
+        repetitions: messagesMentioningUrlArray.filter(
+          (elm) => elm !== originalMessage,
+        ),
+      });
+    }
+  }
+
+  return messageInfoWithRepostsMap;
+}

src/functions/handleMessageReposts.ts

@@ -0,0 +1,30 @@
+import type { Message } from "discord.js";
+import { clearUrl } from "../utils/url.ts";
+import { transformMessageArrayInMap } from "../utils/message.ts";
+
+import updateMessagesArray from "./updateMessagesArray.ts";
+import attemptSendAuthorMessage from "./attemptSendUserMessage.ts";
+
+export default function handleMessageReposts(
+  messagesArray: Message[],
+  newMessage: Message,
+): Message[] {
+  const urlMessagesMap = transformMessageArrayInMap(messagesArray);
+
+  const newMessageClearedUrl = clearUrl(newMessage.content);
+
+  if (!newMessageClearedUrl) return messagesArray;
+
+  const urlMessagesMatchArray = urlMessagesMap.get(newMessageClearedUrl);
+
+  if (!urlMessagesMatchArray) return messagesArray;
+
+  if (urlMessagesMatchArray.length <= 1) {
+    return updateMessagesArray(messagesArray, newMessage);
+  }
+
+  newMessage.delete();
+  attemptSendAuthorMessage(newMessage);
+
+  return messagesArray;
+}