Spacebar/server
1
0
Fork 0
mirror of https://github.com/spacebarchat/server.git synced 2024-11-25 11:43:07 +01:00
Code Issues Releases Activity

lint

Browse Source
This commit is contained in:
Puyodead1 2023-05-05 11:24:17 -04:00
parent 9f4f7cac65
commit cfd8dc0141
No known key found for this signature in database
GPG Key ID: BA5F91AAEF68E5CE
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,10 +92,10 @@ export class User extends BaseClass {
@Column()
username: string; // username max length 32, min 2 (should be configurable)
@Column({nullable: true})
@Column({ nullable: true })
global_name: string; // puyo: pomelo
@Column({nullable: true})
@Column({ nullable: true })
display_name?: string; // puyo: pomelo
@Column()
@ -332,10 +332,12 @@ export class User extends BaseClass {
}
public get handle(): string {
const {pomeloEnabled} = Config.get().general;
const { pomeloEnabled } = Config.get().general;
// if pomelo is enabled, global_name should be set
return pomeloEnabled ? this.global_name as string : `${this.username}#${this.discriminator}`;
return pomeloEnabled
? (this.global_name as string)
: `${this.username}#${this.discriminator}`;
}
static async register({
@ -352,13 +354,13 @@ export class User extends BaseClass {
id?: string;
req?: Request;
}) {
const {pomeloEnabled} = Config.get().general;
const { pomeloEnabled } = Config.get().general;
// trim special uf8 control characters -> Backspace, Newline, ...
username = trimSpecial(username);
let discriminator: string | undefined;
if(pomeloEnabled) discriminator = "0";
if (pomeloEnabled) discriminator = "0";
else {
discriminator = await User.generateDiscriminator(username);
if (!discriminator) {
@ -367,7 +369,8 @@ export class User extends BaseClass {
username: {
code: "USERNAME_TOO_MANY_USERS",
message:
req?.t("auth:register.USERNAME_TOO_MANY_USERS") || "",
req?.t("auth:register.USERNAME_TOO_MANY_USERS") ||
"",
},
});
}