Spacebar/server
1
0
Fork 0
mirror of https://github.com/spacebarchat/server.git synced 2024-09-20 01:31:34 +02:00
Code Issues Releases Activity

Merge pull request #2 from haydaralqassam/fraudcord

Browse Source 
Small fix for tag digit and undefined email
This commit is contained in:
Madeline 2022-09-20 16:27:31 +10:00 committed by GitHub
commit 4020422822
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util/src/entities/Member.ts
View File

@ -74,7 +74,13 @@ export class Member extends BaseClassWithoutId {
nick?: string;
setNick(val: string) {
if (val && BannedWords.find(val)) throw FieldErrors({ nick: { message: "Bad nickname", code: "INVALID_NICKNAME" } });
if (val) {
val = val.split("\n").join("");
val = val.split("\t").join("");
if (BannedWords.find(val)) throw FieldErrors({ nick: { message: "Bad nickname", code: "INVALID_NICKNAME" } });
}
this.nick = val;
}

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

@ -3,7 +3,7 @@ import { BaseClass } from "./BaseClass";
import { BitField } from "../util/BitField";
import { Relationship } from "./Relationship";
import { ConnectedAccount } from "./ConnectedAccount";
import { Config, FieldErrors, Snowflake, trimSpecial, BannedWords } from "..";
import { Config, FieldErrors, Snowflake, trimSpecial, BannedWords, adjustEmail } from "..";
import { Member, Session } from ".";
export enum PublicUserEnum {
@ -69,8 +69,10 @@ export class User extends BaseClass {
setDiscriminator(val: string) {
const number = Number(val);
if (val.length > 4) 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");
val = Number(val).toString();
this.discriminator = val.toString().padStart(4, "0");
}
@ -137,6 +139,15 @@ export class User extends BaseClass {
@Column({ nullable: true, select: false })
email?: string; // email of the user
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" } });
}
this.email = val;
}
@Column()
flags: string; // UserFlags