Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add adjustEmail call to setEmail

Browse Source
This commit is contained in:
Madeline 2022-09-20 16:25:59 +10:00
parent b8aee9b217
commit b132f2d384
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
util/src/entities/User.ts
View File

@ -3,7 +3,7 @@ import { BaseClass } from "./BaseClass";
import { BitField } from "../util/BitField"; import { BitField } from "../util/BitField";
import { Relationship } from "./Relationship"; import { Relationship } from "./Relationship";
import { ConnectedAccount } from "./ConnectedAccount"; import { ConnectedAccount } from "./ConnectedAccount";
import { Config, FieldErrors, Snowflake, trimSpecial, BannedWords } from ".."; import { Config, FieldErrors, Snowflake, trimSpecial, BannedWords, adjustEmail } from "..";
import { Member, Session } from "."; import { Member, Session } from ".";
export enum PublicUserEnum { export enum PublicUserEnum {
@ -72,7 +72,7 @@ export class User extends BaseClass {
if (val.length > 4) throw new Error("invalid discriminator"); if (val.length > 4) throw new Error("invalid discriminator");
if (isNaN(number)) throw new Error("invalid discriminator"); if (isNaN(number)) throw new Error("invalid discriminator");
if (number <= 0 || number >= 10000) throw new Error("discriminator must be between 1 and 9999"); if (number <= 0 || number >= 10000) throw new Error("discriminator must be between 1 and 9999");
val = Number(val).toString() val = Number(val).toString();
this.discriminator = val.toString().padStart(4, "0"); this.discriminator = val.toString().padStart(4, "0");
} }
@ -139,8 +139,12 @@ export class User extends BaseClass {
@Column({ nullable: true, select: false }) @Column({ nullable: true, select: false })
email?: string; // email of the user email?: string; // email of the user
setEmail(val: string) { setEmail(val?: string) {
if (val) {
val = adjustEmail(val);
if (!val) throw FieldErrors({ email: { message: "Invalid email", code: "EMAIL_INVALID" } });
if (!val.match(/([a-z\d.-]{3,})@([a-z\d.-]+).([a-z]{2,})/g)) throw FieldErrors({ email: { message: "Invalid email", code: "EMAIL_INVALID" } }); if (!val.match(/([a-z\d.-]{3,})@([a-z\d.-]+).([a-z]{2,})/g)) throw FieldErrors({ email: { message: "Invalid email", code: "EMAIL_INVALID" } });
}
this.email = val; this.email = val;
} }