diff --git a/src/util/config/types/subconfigurations/limits/UserLimits.ts b/src/util/config/types/subconfigurations/limits/UserLimits.ts
index 8f9b1a97..77092344 100644
--- a/src/util/config/types/subconfigurations/limits/UserLimits.ts
+++ b/src/util/config/types/subconfigurations/limits/UserLimits.ts
@@ -18,6 +18,7 @@
export class UserLimits {
maxGuilds: number = 1048576;
+ minUsername: number = 2;
maxUsername: number = 32;
maxFriends: number = 5000;
}
diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts
index acd2ea74..d1fbb5c2 100644
--- a/src/util/entities/User.ts
+++ b/src/util/entities/User.ts
@@ -38,7 +38,6 @@ import { UserSettings } from "./UserSettings";
export enum PublicUserEnum {
username,
global_name,
- legacy_username,
discriminator,
id,
public_flags,
@@ -241,7 +240,7 @@ export class User extends BaseClass {
// TODO: I don't like this method?
validate() {
- if (this.discriminator) {
+ if (this.discriminator && this.discriminator !== "0") {
const discrim = Number(this.discriminator);
if (
isNaN(discrim) ||
@@ -334,9 +333,8 @@ export class User extends BaseClass {
public get tag(): string {
const { uniqueUsernames } = Config.get().general;
- // if uniqueUsernames is enabled, global_name should be set
return uniqueUsernames
- ? (this.global_name as string)
+ ? this.username
: `${this.username}#${this.discriminator}`;
}
@@ -387,7 +385,7 @@ export class User extends BaseClass {
});
const user = User.create({
- username: username,
+ username: uniqueUsernames ? username.toLowerCase() : username,
discriminator,
id: id || Snowflake.generate(),
email: email,
@@ -397,7 +395,6 @@ export class User extends BaseClass {
},
extended_settings: "{}",
settings: settings,
-
premium_since: Config.get().defaults.user.premium
? new Date()
: undefined,
diff --git a/src/util/schemas/UserModifySchema.ts b/src/util/schemas/UserModifySchema.ts
index e155b9af..72d15dcb 100644
--- a/src/util/schemas/UserModifySchema.ts
+++ b/src/util/schemas/UserModifySchema.ts
@@ -38,4 +38,5 @@ export interface UserModifySchema {
* @maxLength 4
*/
discriminator?: string;
+ global_name?: string;
}
|
