chore: remove docker workflow, fix antispam & revert profanity filter

.ecosystem.config.js → .ecosystem.config.cjs

@@ -1,12 +1,13 @@
-export default {
+module.exports = {
   apps: [
     {
       name: 'interchat',
-      script: 'build/index.js',
+      script: 'build/cluster.js',
+      node_args: "--max-old-space-size=4096 --import ./build/instrument.js",
       env_production: {
         NODE_ENV: 'production',
       },
       autorestart: true,
     },
   ],
-};
+};

src/managers/BlacklistManager.ts

@@ -73,14 +73,16 @@ export default class BlacklistManager {
     if (this.scheduler.taskNames.includes(name)) this.scheduler.stopTask(name);
 
     const execute = async () => {
+      if (SuperClient.instance?.user) {
+        await logUnblacklist(hubId, {
+          type,
+          targetId: id,
+          mod: SuperClient.instance.user,
+          reason: 'Blacklist duration expired.',
+        }).catch(() => null);
+      }
+
       await this.removeBlacklist(type, hubId, id);
-      if (!SuperClient.instance?.user) return;
-      await logUnblacklist(hubId, {
-        type,
-        targetId: id,
-        mod: SuperClient.instance.user,
-        reason: 'Blacklist duration expired.',
-      });
     };
 
     this.scheduler.addTask(name, expires, execute);
@@ -98,7 +100,7 @@ export default class BlacklistManager {
     type: 'user' | 'server',
     id: Snowflake,
     opts: {
-      hubId: string,
+      hubId: string;
       expires?: Date;
       reason?: string;
     },
@@ -223,7 +225,8 @@ export default class BlacklistManager {
     moderatorId: Snowflake,
     expires?: Date,
   ) {
-    const guild = typeof server === 'string' ? await SuperClient.instance.fetchGuild(server) : server;
+    const guild =
+      typeof server === 'string' ? await SuperClient.instance.fetchGuild(server) : server;
     if (!guild) return null;
 
     const dbGuild = await db.blacklistedServers.upsert({

src/scripts/network/runChecks.ts

@@ -8,6 +8,7 @@ import { containsInviteLinks, replaceLinks } from '../../utils/Utils.js';
 import { check as checkProfanity } from '../../utils/Profanity.js';
 import { runAntiSpam } from './antiSpam.js';
 import { analyzeImageForNSFW, isUnsafeImage } from '../../utils/NSFWDetection.js';
+import { logBlacklist } from '../../utils/HubLogger/ModLogs.js';
 
 // if account is created within the last 7 days
 export const isNewUser = (message: Message) => {
@@ -40,27 +41,21 @@ export const isCaughtSpam = async (
 ) => {
   const antiSpamResult = runAntiSpam(message.author, 3);
   if (!antiSpamResult) return false;
-  const { blacklistManager } = message.client;
+  const { addUserBlacklist, notifyBlacklist, scheduleRemoval } = message.client.blacklistManager;
 
   if (settings.has('SpamFilter') && antiSpamResult.infractions >= 3) {
-    await blacklistManager.addUserBlacklist(
-      hubId,
-      message.author.id,
-      'Auto-blacklisted for spamming.',
-      message.client.user.id,
-      60 * 5000,
-    );
-    blacklistManager.scheduleRemoval('user', message.author.id, hubId, 60 * 5000);
-    blacklistManager
-      .notifyBlacklist('user', message.author.id, {
-        hubId,
-        expires: new Date(Date.now() + 60 * 5000),
-        reason: 'Auto-blacklisted for spamming.',
-      })
-      .catch(() => null);
+    const expires = new Date(Date.now() + 60 * 5000);
+    const reason = 'Auto-blacklisted for spamming.';
+    const target = message.author;
+    const mod = message.client.user;
+
+    await addUserBlacklist(hubId, target.id, reason, mod.id, 60 * 5000);
+    scheduleRemoval('user', target.id, hubId, 60 * 5000);
+    await notifyBlacklist('user', target.id, { hubId, expires, reason }).catch(() => null);
+    await logBlacklist(hubId, message.client, { target, mod, reason, expires }).catch(() => null);
   }
 
-  message.react(emojis.timeout).catch(() => null);
+  await message.react(emojis.timeout).catch(() => null);
   return true;
 };
 

src/utils/Constants.ts

@@ -32,9 +32,9 @@ export const REGEX = {
   IMGUR_LINKS:
     /(?:https?:\/\/)?(?:www\.)?imgur\.com\/(?:a\/|gallery\/)?([a-zA-Z0-9]+)(?:\.[a-zA-Z]+)?/i,
   /** matches profanity words */
-  PROFANITY: new RegExp(profanity.map((word) => `\\b${word}\\b|${word}`).join('|'), 'gi'),
+  PROFANITY: new RegExp(profanity.map((word) => `\\b${word}\\b`).join('|'), 'gi'),
   /** matches slurs */
-  SLURS: new RegExp(slurs.map((word) => `\\b${word}\\b|${word}`).join('|'), 'gi'),
+  SLURS: new RegExp(slurs.map((word) => `\\b${word}\\b`).join('|'), 'gi'),
   TENOR_LINKS: /https:\/\/tenor\.com\/view\/.*-(\d+)/,
   EMOJI: /<(a)?:([a-zA-Z0-9_]+):(\d+)>/,
   BANNED_WEBHOOK_WORDS: /discord|clyde|```/gi,

src/utils/HubLogger/ModLogs.ts

@@ -101,6 +101,7 @@ export const logUnblacklist = async (
   if (opts.type === 'user') {
     blacklisted = await BlacklistManager.fetchUserBlacklist(hub.id, opts.targetId);
     const user = await opts.mod.client.users.fetch(opts.targetId).catch(() => null);
+
     name = user?.username ?? `${blacklisted?.username}`;
     originalReason = blacklisted?.blacklistedFrom.find((h) => h.hubId === hub.id)?.reason;
   }

src/utils/JSON/profanity.json

@@ -1,5 +1,27 @@
 {
-  "slurs": ["nigga", "nigg", "niggas", "nigger", "n1gger", "n1gg3r", "niger", "kys", "nig", "fag", "faggot", "fagger"],
+  "slurs": [
+    "nigga",
+    "nigg",
+    "niggas",
+    "nigger",
+    "n1gger",
+    "n1gg3r",
+    "niger",
+    "kys",
+    "fagg",
+    "fagger",
+    "fag",
+    "fagging",
+    "faggitt",
+    "faggot",
+    "faggs",
+    "fagot",
+    "fagots",
+    "fags",
+    "n i g g a",
+    "n i g g e r",
+    "n i g g"
+  ],
 
   "profanity": [
     "orgy",
@@ -11,9 +33,6 @@
     "a55",
     "anal",
     "ar5e",
-    "arrse",
-    "arse",
-    "ass",
     "ass-fucker",
     "asses",
     "assfucker",
@@ -130,14 +149,6 @@
     "f u c k",
     "f u c k e r",
     "f4nny",
-    "fag",
-    "fagging",
-    "faggitt",
-    "faggot",
-    "faggs",
-    "fagot",
-    "fagots",
-    "fags",
     "fanny",
     "fannyflaps",
     "fannyfucker",