feat: remove legacy profanity filter

Author: dev-737

.github/FUNDING.yml

@@ -3,7 +3,7 @@
 # github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 # patreon: # Replace with a single Patreon username
 # open_collective: # Replace with a single Open Collective username
-ko_fi: dev737
+ko_fi: interchat
 # tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 # community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
 # liberapay: # Replace with a single Liberapay username

README.md

@@ -51,7 +51,7 @@ A powerful Discord bot for easy and real-time chatting hubs across multiple Disc
 3. Connect a channel to a hub containing many other discord servers using the `/hub join` command.
 4. Start chatting across servers!
 
-For detailed instructions, check out our [Donate](https://ko-fi.com/dev737).
+For detailed instructions, check out our [Donate](https://ko-fi.com/interchat).
 
 ## 💻 Self-Hosting
 

locales/en.yml

@@ -109,7 +109,6 @@ connection:
       connected: Connected
       emColor: Embed Color
       compact: Compact Mode
-      profanity: Profanity Filter
     footer: Use the button & dropdown below to manage your connection.
   selects:
     placeholder: '🛠️ Select an option to edit this connection'
@@ -119,7 +118,7 @@ connection:
 
       Unpaused connection for {channel}! Messages from the hub will start coming into the channel and you can send messages to the hub again.
     tips: |
-      **💡 Tip:** Use {pause_cmd} to pause the connection or {edit_cmd} to set embed colors, toggle profanity filter, and more.
+      **💡 Tip:** Use {pause_cmd} to pause the connection or {edit_cmd} to set embed colors, invite to your server and more.
   paused:
     desc: |
       ### {clock_emoji} Paused Connection
@@ -353,9 +352,6 @@ hub:
       modLogs:
         label: Mod Logs
         description: Log Moderation actions. (eg. blacklist, message deletes, etc.)
-      profanity:
-        label: Profanity Filter
-        description: Log messages that are caught by the profanity filter.
       joinLeaves:
         label: Join/Leave
         description: Log when a server joins or leaves this hub.

package.json

@@ -19,7 +19,7 @@
     "prepare": "husky"
   },
   "sponsor": {
-    "url": "https://ko-fi.com/dev737"
+    "url": "https://ko-fi.com/interchat"
   },
   "type": "module",
   "dependencies": {

src/api/index.ts

@@ -15,17 +15,17 @@
  * along with InterChat.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { Hono } from 'hono';
 import { VoteManager } from '#src/managers/VoteManager.js';
 import Constants from '#src/utils/Constants.js';
+import { handleError } from '#src/utils/Utils.js';
 import Logger from '#utils/Logger.js';
 import { serve } from '@hono/node-server';
 import {
   Collection,
   WebhookClient,
   type WebhookMessageCreateOptions,
 } from 'discord.js';
-import { handleError } from '#src/utils/Utils.js';
+import { Hono } from 'hono';
 
 export const webhookMap = new Collection<string, WebhookClient>();
 
@@ -46,7 +46,6 @@ export const startApi = () => {
       data: WebhookMessageCreateOptions;
     }>();
 
-    const start = performance.now();
     let client = webhookMap.get(body.webhookUrl);
     if (!client) {
       client = new WebhookClient({ url: body.webhookUrl });
@@ -55,7 +54,6 @@ export const startApi = () => {
 
     try {
       const res = await client.send(body.data);
-      Logger.info(`Webhook message sent in ${performance.now() - start}ms`);
       return c.json({ data: res });
     }
     catch (err) {
@@ -64,7 +62,7 @@ export const startApi = () => {
     }
   });
 
-  app.all('*', (c) => c.text('404!', 404));
+  app.all('*', (c) => c.redirect(Constants.Links.Website));
 
   serve({ fetch: app.fetch, port: Number(process.env.PORT || 3000) });
   Logger.info(`API server started on port ${process.env.PORT || 3000}`);

src/commands/Main/connection/edit.ts

@@ -51,7 +51,7 @@ export default class ConnectionEditSubcommand extends BaseCommand {
     super({
       name: 'edit',
       description:
-        '📝 Set embed colors, profanity filter, compact mode and more!',
+        '📝 Set embed colors, compact mode and more!',
       types: { slash: true, prefix: true },
       options: [
         {
@@ -238,13 +238,6 @@ export default class ConnectionEditSubcommand extends BaseCommand {
         await updateConnection({ channelId }, { compact: !connection.compact });
         break;
 
-      case 'profanity':
-        await updateConnection(
-          { channelId },
-          { profFilter: !connection.profFilter },
-        );
-        break;
-
       case 'invite': {
         const modal = new ModalBuilder()
           .setTitle('Add Invite Link')

src/commands/Main/editMsg.ts

@@ -47,7 +47,6 @@ import { CustomID } from '#utils/CustomID.js';
 import db from '#utils/Db.js';
 import { getAttachmentURL } from '#utils/ImageUtils.js';
 import { t } from '#utils/Locale.js';
-import { censor } from '#utils/ProfanityUtils.js';
 import { containsInviteLinks, fetchUserLocale, handleError, replaceLinks } from '#utils/Utils.js';
 
 interface ImageUrls {
@@ -190,8 +189,8 @@ export default class EditMessage extends BaseCommand {
 
     // Prepare the new message contents and embeds
     const imageURLs = await this.getImageURLs(target, mode, messageToEdit);
-    const newContents = this.getCompactContents(messageToEdit, imageURLs);
-    const newEmbeds = await this.buildEmbeds(target, mode, messageToEdit, {
+    const newContent = this.getCompactContents(messageToEdit, imageURLs);
+    const newEmbed = await this.buildEmbeds(target, mode, messageToEdit, {
       guildId: originalMsgData.guildId,
       user: interaction.user,
       imageURLs,
@@ -217,10 +216,10 @@ export default class EditMessage extends BaseCommand {
       let content: string | null = null;
       let embeds: EmbedBuilder[] = [];
       if (msg.mode === ConnectionMode.Embed) {
-        embeds = connection.profFilter ? [newEmbeds.censored] : [newEmbeds.normal];
+        embeds = [newEmbed];
       }
       else {
-        content = connection.profFilter ? newContents.censored : newContents.normal;
+        content = newContent;
       }
 
       // Edit the message
@@ -317,13 +316,7 @@ export default class EditMessage extends BaseCommand {
         )
         .setFooter({ text: `Server: ${guild?.name}` });
     }
-
-    const censored = EmbedBuilder.from({
-      ...embed.data,
-      description: censor(embedContent),
-    });
-
-    return { normal: embed, censored };
+    return embed;
   }
 
   private sanitizeMessage(content: string, settings: SerializedHubSettings) {
@@ -339,6 +332,6 @@ export default class EditMessage extends BaseCommand {
       compactMsg = compactMsg.replace(imageUrls.oldURL, imageUrls.newURL);
     }
 
-    return { normal: compactMsg, censored: censor(compactMsg) };
+    return compactMsg;
   }
 }

src/commands/Main/hub/config/logging.ts

@@ -289,12 +289,6 @@ export default class HubConfigLoggingSubcommand extends BaseCommand {
         description: t('hub.manage.logs.modLogs.description', locale),
         emoji: '👮',
       },
-      {
-        label: t('hub.manage.logs.profanity.label', locale),
-        value: 'profanity',
-        description: t('hub.manage.logs.profanity.description', locale),
-        emoji: '🤬',
-      },
       {
         label: t('hub.manage.logs.networkAlerts.label', locale),
         value: 'networkAlerts',

src/managers/ConnectionManager.ts

@@ -94,10 +94,6 @@ export default class ConnectionManager {
     });
   }
 
-  async setProfanityFilter(profFilter: boolean): Promise<void> {
-    await this.updateConnectionIfExists({ profFilter });
-  }
-
   // Private helper methods
   private buildCacheKey(hubId: string): string {
     return `${RedisKeys.Hub}:${hubId}:connections`;

src/managers/InfractionManager.ts

@@ -16,19 +16,11 @@
  */
 
 import { isDate } from 'node:util/types';
-import type {
-  Infraction,
-  InfractionStatus,
-  InfractionType,
-  Prisma,
-} from '@prisma/client';
+import type { Infraction, InfractionStatus, InfractionType, Prisma } from '@prisma/client';
 import type { Client, Snowflake, User } from 'discord.js';
 import { HubService } from '#src/services/HubService.js';
 import db from '#src/utils/Db.js';
-import {
-  logServerUnblacklist,
-  logUserUnblacklist,
-} from '#src/utils/hub/logger/ModLogs.js';
+import { logServerUnblacklist, logUserUnblacklist } from '#src/utils/hub/logger/ModLogs.js';
 import type { ConvertDatesToString } from '#types/Utils.d.ts';
 import { CacheManager } from '#src/managers/CacheManager.js';
 import getRedis from '#src/utils/Redis.js';
@@ -92,11 +84,7 @@ export default class InfractionManager {
     filter: { type: InfractionType; hubId: string; status?: InfractionStatus },
     data: Prisma.InfractionUpdateInput,
   ) {
-    const infraction = await this.fetchInfraction(
-      filter.type,
-      filter.hubId,
-      filter.status,
-    );
+    const infraction = await this.fetchInfraction(filter.type, filter.hubId, filter.status);
     if (!infraction) return null;
 
     const updated = await db.infraction.update({
@@ -121,27 +109,20 @@ export default class InfractionManager {
     });
   }
 
-  public async getHubInfractions(
-    hubId: string,
-    opts?: { type?: InfractionType; count?: number },
-  ) {
+  public async getHubInfractions(hubId: string, opts?: { type?: InfractionType; count?: number }) {
     let infractionsArr =
-			(await this.cacheManager.get(
-			  `${this.targetId}:${hubId}`,
-			  async () => await this.queryEntityInfractions(hubId),
-			)) ?? [];
+      (await this.cacheManager.get(
+        `${this.targetId}:${hubId}`,
+        async () => await this.queryEntityInfractions(hubId),
+      )) ?? [];
 
     if (opts?.type) infractionsArr = infractionsArr.filter((i) => i.type === opts.type);
     if (opts?.count) infractionsArr = infractionsArr.slice(0, opts.count);
 
     return this.updateInfractionDates(infractionsArr);
   }
 
-  public async fetchInfraction(
-    type: InfractionType,
-    hubId: string,
-    status?: InfractionStatus,
-  ) {
+  public async fetchInfraction(type: InfractionType, hubId: string, status?: InfractionStatus) {
     const infractions = await this.getHubInfractions(hubId, { type });
     const infraction = infractions.find(
       (i) => (status ? i.status === status : true) && i.type === type,
@@ -155,10 +136,7 @@ export default class InfractionManager {
     hubId: string,
     status: Exclude<InfractionStatus, 'ACTIVE'> = 'REVOKED',
   ) {
-    const revoked = await this.updateInfraction(
-      { type, hubId, status: 'ACTIVE' },
-      { status },
-    );
+    const revoked = await this.updateInfraction({ type, hubId, status: 'ACTIVE' }, { status });
     return revoked;
   }
 
@@ -196,9 +174,9 @@ export default class InfractionManager {
   protected async cacheEntity(entity: Infraction) {
     const entitySnowflake = entity.userId ?? entity.serverId;
     const key = this.getKey(entitySnowflake as string, entity.hubId);
-    const existing = (
-      await this.getHubInfractions(entity.hubId, { type: entity.type })
-    ).filter((i) => i.id !== entity.id);
+    const existing = (await this.getHubInfractions(entity.hubId, { type: entity.type })).filter(
+      (i) => i.id !== entity.id,
+    );
 
     return this.cacheManager.set(key, [...existing, entity]);
   }
@@ -214,9 +192,7 @@ export default class InfractionManager {
     );
   }
 
-  protected updateInfractionDates(
-    infractions: ConvertDatesToString<Infraction>[],
-  ) {
+  protected updateInfractionDates(infractions: ConvertDatesToString<Infraction>[]) {
     if (infractions.length === 0) {
       return [];
     }
@@ -236,11 +212,7 @@ export default class InfractionManager {
   }
 
   public filterValidInfractions(infractions: Infraction[]): Infraction[] {
-    return (
-      infractions.filter(
-        ({ expiresAt }) => !expiresAt || expiresAt > new Date(),
-      ) ?? []
-    );
+    return infractions.filter(({ expiresAt }) => !expiresAt || expiresAt > new Date()) ?? [];
   }
 
   public isExpiredInfraction(infraction: Infraction | null) {