Merge branch 'fix/electron_premium_since' into maddyrtc

This commit is contained in:
Madeline 2022-03-08 21:46:51 +11:00
commit 3b439f74f1
2 changed files with 9 additions and 7 deletions

View File

@ -57,12 +57,14 @@ router.patch("/", route({ body: "UserModifySchema" }), async (req: Request, res:
user.data.hash = await bcrypt.hash(body.new_password, 12);
}
var check_username = body?.username?.replace(/\s/g, '');
if(!check_username && !body?.avatar && !body?.banner) {
throw FieldErrors({
username: { code: "BASE_TYPE_REQUIRED", message: req.t("common:field.BASE_TYPE_REQUIRED") }
});
}
if(body.username){
var check_username = body?.username?.replace(/\s/g, '');
if(!check_username) {
throw FieldErrors({
username: { code: "BASE_TYPE_REQUIRED", message: req.t("common:field.BASE_TYPE_REQUIRED") }
});
}
}
await user.save();

View File

@ -86,7 +86,7 @@ export class Member extends BaseClassWithoutId {
joined_at: Date;
@Column({ nullable: true })
premium_since?: Date;
premium_since?: number;
@Column()
deaf: boolean;