@@ -99,10 +99,10 @@ export class User extends BaseClass {
99
99
@Column ( )
100
100
username : string ; // username max length 32, min 2 (should be configurable)
101
101
102
- @Column ( { nullable : true } )
102
+ @Column ( { nullable : true } )
103
103
global_name : string ; // puyo: pomelo
104
104
105
- @Column ( { nullable : true } )
105
+ @Column ( { nullable : true } )
106
106
display_name ?: string ; // puyo: pomelo
107
107
108
108
@Column ( )
@@ -342,10 +342,12 @@ export class User extends BaseClass {
342
342
}
343
343
344
344
public get handle ( ) : string {
345
- const { pomeloEnabled} = Config . get ( ) . general ;
345
+ const { pomeloEnabled } = Config . get ( ) . general ;
346
346
347
347
// if pomelo is enabled, global_name should be set
348
- return pomeloEnabled ? this . global_name as string : `${ this . username } #${ this . discriminator } ` ;
348
+ return pomeloEnabled
349
+ ? ( this . global_name as string )
350
+ : `${ this . username } #${ this . discriminator } ` ;
349
351
}
350
352
351
353
static async register ( {
@@ -362,13 +364,13 @@ export class User extends BaseClass {
362
364
id ?: string ;
363
365
req ?: Request ;
364
366
} ) {
365
- const { pomeloEnabled} = Config . get ( ) . general ;
367
+ const { pomeloEnabled } = Config . get ( ) . general ;
366
368
367
369
// trim special uf8 control characters -> Backspace, Newline, ...
368
370
username = trimSpecial ( username ) ;
369
371
370
372
let discriminator : string | undefined ;
371
- if ( pomeloEnabled ) discriminator = "0" ;
373
+ if ( pomeloEnabled ) discriminator = "0" ;
372
374
else {
373
375
discriminator = await User . generateDiscriminator ( username ) ;
374
376
if ( ! discriminator ) {
@@ -377,7 +379,8 @@ export class User extends BaseClass {
377
379
username : {
378
380
code : "USERNAME_TOO_MANY_USERS" ,
379
381
message :
380
- req ?. t ( "auth:register.USERNAME_TOO_MANY_USERS" ) || "" ,
382
+ req ?. t ( "auth:register.USERNAME_TOO_MANY_USERS" ) ||
383
+ "" ,
381
384
} ,
382
385
} ) ;
383
386
}
0 commit comments