feat: bug fixes and improvements

Author: mrepol742

src/commands/phishing.ts

@@ -0,0 +1,55 @@
+import { Message } from "../../types/message";
+import { phishingSet } from "..";
+import { normalize } from "../components/utils/url";
+import log from "../components/utils/log";
+
+export const info = {
+  command: "phishing",
+  description: "A simple phishtank test command.",
+  usage: "phishing",
+  example: "phishing",
+  role: "user",
+  cooldown: 5000,
+};
+
+export default async function (msg: Message) {
+  if (!/^phishing/i.test(msg.body)) return;
+
+  if (!msg.hasQuotedMsg) {
+    const testMessage = `
+    \`Phishtank\`
+
+    Found ${phishingSet.size} phishing pages.
+    Hint: You can reply this command to messages.
+  `;
+
+    await msg.reply(testMessage);
+    return;
+  }
+
+  const qouted = await msg.getQuotedMessage();
+  const extractUrls = qouted.body.match(/(https?:\/\/[^\s]+)/g) || [];
+  const urls = extractUrls
+    .map((url) => normalize(url))
+    .filter((u): u is string => Boolean(u));
+  const spamUrls = urls.filter((url) => phishingSet.has(url));
+  if (spamUrls.length == 0) {
+    const testMessage = `
+    \`Phishtank\`
+
+    This message doesn't contain any links or so.
+  `;
+
+    await msg.reply(testMessage);
+    return;
+  }
+
+  const text = `
+    \`Phishing Alert\`
+
+    We've found that this url(s): \`${spamUrls.join(", ")}\`
+    to be phishing site/page.
+    Proceed with caution.
+  `;
+  await msg.reply(text);
+}

src/components/events/message.ts

@@ -46,18 +46,20 @@ export default async function (msg: Message, type: string) {
 
   const lid = msg.author ? msg.author.split("@")[0] : msg.from.split("@")[0];
 
-  // process normalization
-  msg.body = msg.body
-    .normalize("NFKC")
-    .replace(/[\u0300-\u036f\u00b4\u0060\u005e\u007e]/g, "")
-    .trim();
-
   /*
    * Block users from running commands.
    */
   const isBlockedUser = await isBlocked(lid);
   if (isBlockedUser) return;
 
+  const prefix = !msg.body.startsWith(commandPrefix);
+
+  /*
+   * Prefix
+   */
+  if (!commandPrefixLess && prefix) return;
+  if (msg.fromMe && prefix) return;
+
   /*
    *
    * Check for scam urls
@@ -84,6 +86,12 @@ export default async function (msg: Message, type: string) {
 
   if (msg.isForwarded) return;
 
+  // process normalization
+  msg.body = msg.body
+    .normalize("NFKC")
+    .replace(/[\u0300-\u036f\u00b4\u0060\u005e\u007e]/g, "")
+    .trim();
+
   /*
    *
    * Quiz command validation
@@ -95,14 +103,6 @@ export default async function (msg: Message, type: string) {
     });
   }
 
-  const prefix = !msg.body.startsWith(commandPrefix);
-
-  /*
-   * Prefix
-   */
-  if (!commandPrefixLess && prefix) return;
-  if (msg.fromMe && prefix) return;
-
   /*
    *
    * Override the default function

src/components/services/user.ts

@@ -43,10 +43,11 @@ export async function findOrCreateUser(msg: Message): Promise<boolean> {
         commandCount: 1,
       },
     });
+    return true;
   } catch (error) {
     log.error("Database", `Failed to find or create user.`, error);
   }
-  return true;
+  return false;
 }
 
 export async function getUserbyLid(lid: string) {

src/index.ts

@@ -18,13 +18,14 @@ const monitor = new MemoryMonitor({
   thresholdMB: parseInt(process.env.PROJECT_THRESHOLD_MEMORY || "1024", 10),
 });
 const phishtank = new PhishTankClient();
-const phishingSet: Set<string> = phishtank.getPhishingSet();
+let phishingSet: Set<string>;
 
 async function main() {
   checkRequirements();
   monitor.start();
   phishtank.startAutoUpdateLoop();
   await phishtank.init();
+  phishingSet = phishtank.getPhishingSet();
   await client.initialize();
 
   mapCommands();