Update index.js

index.js

@@ -54,11 +54,11 @@ if (!isMainThread) {
         updateLogin: db.prepare('UPDATE users SET is_login = ? WHERE id = ?'),
         updateProfileWithUsername: db.prepare(`
   UPDATE users SET 
-    username = COALESCE(NULLIF(@username, ''), username),
-    name = COALESCE(NULLIF(@name, ''), name),
-    bio = COALESCE(NULLIF(@bio, ''), bio),
-    date_of_birth = COALESCE(NULLIF(@date_of_birth, ''), date_of_birth),
-    is_profile_public = COALESCE(NULLIF(@is_profile_public, ''), is_profile_public)
+    username = @username,
+    name = @name,
+    bio = @bio,
+    date_of_birth = @date_of_birth,
+    is_profile_public = @is_profile_public
   WHERE id = @id
 `),
         updatePhoto: db.prepare('UPDATE users SET pic_url = ? WHERE id = ?'),
@@ -92,18 +92,18 @@ if (!isMainThread) {
     stmts.updateProfileWithUsername.run({
       id: data.userId,
       username: data.username,
-      name: data.name || '',
-      bio: data.bio || '',
-      date_of_birth: data.date_of_birth || '',
-      is_profile_public: data.is_profile_public || 'true'
+      name: data.name,
+      bio: data.bio,
+      date_of_birth: data.date_of_birth,
+      is_profile_public: data.is_profile_public
     });
   } else {
     stmts.updateProfile.run({
       id: data.userId,
-      name: data.name || '',
-      bio: data.bio || '',
-      date_of_birth: data.date_of_birth || '',
-      is_profile_public: data.is_profile_public || 'true'
+      name: data.name,
+      bio: data.bio,
+      date_of_birth: data.date_of_birth,
+      is_profile_public: data.is_profile_public
     });
   }
   result = { success: true };
@@ -144,9 +144,22 @@ if (!isMainThread) {
                         break;
                     case 'updateProfile':
   if (op.data && op.data.username) {
-    stmts.updateProfileWithUsername.run(op.data);
+    stmts.updateProfileWithUsername.run({
+      id: op.data.id,
+      username: op.data.username,
+      name: op.data.name,
+      bio: op.data.bio,
+      date_of_birth: op.data.date_of_birth,
+      is_profile_public: op.data.is_profile_public
+    });
   } else {
-    stmts.updateProfile.run(op.data);
+    stmts.updateProfile.run({
+      id: op.data.id,
+      name: op.data.name,
+      bio: op.data.bio,
+      date_of_birth: op.data.date_of_birth,
+      is_profile_public: op.data.is_profile_public
+    });
   }
   break;
                     case 'updatePhoto':
@@ -546,9 +559,9 @@ async function setupFastify() {
     return;
   }
   
-  // Handle username update
-  if (username !== undefined && username !== null && username !== '') {
-    const cleanUsername = username.trim().toLowerCase();
+  let cleanUsername = null;
+  if (username && username.trim() !== '') {
+    cleanUsername = username.trim().toLowerCase();
     
     if (cleanUsername.length < 3 || cleanUsername.length > MAX_USERNAME_LENGTH) {
       reply.status(400).send({ detail: `Username must be 3-${MAX_USERNAME_LENGTH} chars` });
@@ -561,29 +574,18 @@ async function setupFastify() {
         reply.status(409).send({ detail: 'Username exists' });
         return;
       }
-      
-      // Pass username explicitly
-      await dbRequest('updateProfile', { 
-        userId: id, 
-        username: cleanUsername,
-        name: name || '',
-        bio: bio || '',
-        date_of_birth: date_of_birth || '',
-        is_profile_public: is_profile_public || 'true'
-      });
-      
-      reply.send({ success: true });
-      return;
+    } else {
+      cleanUsername = null;
     }
   }
   
-  // Update without username change
   await dbRequest('updateProfile', { 
     userId: id, 
-    name: name || '',
-    bio: bio || '',
-    date_of_birth: date_of_birth || '',
-    is_profile_public: is_profile_public || 'true'
+    username: cleanUsername,
+    name: name || user.name,
+    bio: bio !== undefined ? bio : user.bio,
+    date_of_birth: date_of_birth || user.date_of_birth,
+    is_profile_public: is_profile_public || user.is_profile_public
   });
   
   reply.send({ success: true });