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

user validation stuff

Browse Source
This commit is contained in:
Madeline 2022-12-17 18:50:27 +11:00
parent 1e88d63186
commit 1148eaa6a2
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/util/entities/BaseClass.ts
View File

@ -71,7 +71,7 @@ export class BaseClass extends BaseClassWithoutId {
@BeforeUpdate() @BeforeUpdate()
@BeforeInsert() @BeforeInsert()
do_validate() { _do_validate() {
if (!this.id) this.id = Snowflake.generate(); if (!this.id) this.id = Snowflake.generate();
} }
} }

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

@ -195,15 +195,9 @@ export class User extends BaseClass {
@Column({ type: "simple-json", select: false }) @Column({ type: "simple-json", select: false })
extended_settings: string; extended_settings: string;
// @BeforeUpdate() // TODO: I don't like this method?
// _update_validator() { this.validate(true); } validate() {
if (this.email) {
// @BeforeInsert()
// _insert_validator() { this.validate(false); }
validate(/*update: boolean = false*/) {
// inserting or email provided in update
if (/*!update || */this.email) {
this.email = adjustEmail(this.email); this.email = adjustEmail(this.email);
if (!this.email) if (!this.email)
throw FieldErrors({ throw FieldErrors({
@ -215,8 +209,7 @@ export class User extends BaseClass {
}); });
} }
// inserting or discrim provided if (this.discriminator) {
if (/*!update ||*/ this.discriminator) {
const discrim = Number(this.discriminator); const discrim = Number(this.discriminator);
if (this.discriminator.length > 4) if (this.discriminator.length > 4)
throw FieldErrors({ throw FieldErrors({