Merge branch 'fix/electron_premium_since' into maddyrtc

2 files changed, 9 insertions, 7 deletions

diff --git a/api/src/routes/users/@me/index.ts b/api/src/routes/users/@me/index.ts

index 5834921c..d32b44f9 100644
--- a/api/src/routes/users/@me/index.ts
+++ b/api/src/routes/users/@me/index.ts
@@ -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();
 
diff --git a/util/src/entities/Member.ts b/util/src/entities/Member.ts

index 3c5f9db0..b7406881 100644
--- a/util/src/entities/Member.ts
+++ b/util/src/entities/Member.ts
@@ -86,7 +86,7 @@ export class Member extends BaseClassWithoutId {
 	joined_at: Date;
 
 	@Column({ nullable: true })
-	premium_since?: Date;
+	premium_since?: number;
 
 	@Column()
 	deaf: boolean;