From b504edae92542003a4137c1ecaab8a9a66b995cb Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Sun, 11 Sep 2022 23:19:55 +1000 Subject: Primitive banned words blocking --- util/src/entities/Member.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'util/src/entities/Member.ts') diff --git a/util/src/entities/Member.ts b/util/src/entities/Member.ts index a6798a7c..387181df 100644 --- a/util/src/entities/Member.ts +++ b/util/src/entities/Member.ts @@ -1,6 +1,5 @@ import { PublicUser, User } from "./User"; import { Message } from "./Message"; -import { BaseClass } from "./BaseClass"; import { Column, Entity, @@ -13,7 +12,7 @@ import { RelationId, } from "typeorm"; import { Guild } from "./Guild"; -import { Config, emitEvent } from "../util"; +import { Config, emitEvent, BannedWords, FieldErrors } from "../util"; import { GuildCreateEvent, GuildDeleteEvent, @@ -21,6 +20,7 @@ import { GuildMemberRemoveEvent, GuildMemberUpdateEvent, MessageCreateEvent, + } from "../interfaces"; import { HTTPError } from "lambert-server"; import { Role } from "./Role"; @@ -73,6 +73,11 @@ export class Member extends BaseClassWithoutId { @Column({ nullable: true }) nick?: string; + setNick(val: string) { + if (BannedWords.find(val)) throw FieldErrors({ nick: { message: "Bad nickname", code: "INVALID_NICKNAME" } }); + this.nick = val; + } + @JoinTable({ name: "member_roles", joinColumn: { name: "index", referencedColumnName: "index" }, @@ -244,7 +249,7 @@ export class Member extends BaseClassWithoutId { where: { id: guild_id, }, - relations: [ ...PublicGuildRelations, "system_channel" ], + relations: [...PublicGuildRelations, "system_channel"], }); if (await Member.count({ id: user.id, guild: { id: guild_id } })) -- cgit 1.5.1