From 8d2a2ba12e65192782b3f90e66365f8265c1b5d7 Mon Sep 17 00:00:00 2001
From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com>
Date: Tue, 25 Oct 2022 10:58:36 +1100
Subject: Move message auto mod to the api route instead of a
 @beforeinsert/update method

---
 src/util/entities/Message.ts | 16 ----------------
 src/util/util/Constants.ts   |  4 ++++
 2 files changed, 4 insertions(+), 16 deletions(-)

(limited to 'src/util')

diff --git a/src/util/entities/Message.ts b/src/util/entities/Message.ts
index a52b4785..013de378 100644
--- a/src/util/entities/Message.ts
+++ b/src/util/entities/Message.ts
@@ -5,8 +5,6 @@ import { Channel } from "./Channel";
 import { InteractionType } from "../interfaces/Interaction";
 import { Application } from "./Application";
 import {
-	BeforeInsert,
-	BeforeUpdate,
 	Column,
 	CreateDateColumn,
 	Entity,
@@ -23,8 +21,6 @@ import { Guild } from "./Guild";
 import { Webhook } from "./Webhook";
 import { Sticker } from "./Sticker";
 import { Attachment } from "./Attachment";
-import { BannedWords } from "../util";
-import { HTTPError } from "lambert-server";
 
 export enum MessageType {
 	DEFAULT = 0,
@@ -206,18 +202,6 @@ export class Message extends BaseClass {
 
 	@Column({ type: "simple-json", nullable: true })
 	components?: MessageComponent[];
-
-	@BeforeUpdate()
-	@BeforeInsert()
-	validate() {
-		if (this.content) {
-			if (BannedWords.find(this.content))
-				throw new HTTPError(
-					"Message was blocked by automatic moderation",
-					200000,
-				);
-		}
-	}
 }
 
 export interface MessageComponent {
diff --git a/src/util/util/Constants.ts b/src/util/util/Constants.ts
index 7c5b7dcb..46cf2e4f 100644
--- a/src/util/util/Constants.ts
+++ b/src/util/util/Constants.ts
@@ -973,6 +973,10 @@ export const DiscordApiErrors = {
 		undefined,
 		["5"],
 	),
+	AUTOMODERATOR_BLOCK: new ApiError(
+		"Message was blocked by automatic moderation",
+		200000,
+	),
 
 	//Other errors
 	UNKNOWN_VOICE_STATE: new ApiError("Unknown Voice State", 10065, 404),
-- 
cgit 1.5.1