From e245b4fa229bee1e2ab97fcb42de3831b8bdbe5b Mon Sep 17 00:00:00 2001
From: Vijay A <vraravam@users.noreply.github.com>
Date: Wed, 24 May 2023 06:57:50 +0530
Subject: Upgrade npm modules

---
 src/internal-server/app/ImageHelper.js                          | 2 +-
 src/internal-server/app/Middleware/ConvertEmptyStringsToNull.js | 2 +-
 src/internal-server/start/migrate.js                            | 6 +++---
 src/internal-server/test.ts                                     | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/internal-server')

diff --git a/src/internal-server/app/ImageHelper.js b/src/internal-server/app/ImageHelper.js
index 905ba81ab..fba610069 100644
--- a/src/internal-server/app/ImageHelper.js
+++ b/src/internal-server/app/ImageHelper.js
@@ -21,7 +21,7 @@ const moveIcon = async icon => {
     name: iconId,
     overwrite: true,
   });
-  return !icon.moved() ? '-1' : iconId;
+  return icon.moved() ? iconId : '-1';
 };
 
 const deduceIconUrl = iconId =>
diff --git a/src/internal-server/app/Middleware/ConvertEmptyStringsToNull.js b/src/internal-server/app/Middleware/ConvertEmptyStringsToNull.js
index 9591cdc41..91ab22ee5 100644
--- a/src/internal-server/app/Middleware/ConvertEmptyStringsToNull.js
+++ b/src/internal-server/app/Middleware/ConvertEmptyStringsToNull.js
@@ -3,7 +3,7 @@ class ConvertEmptyStringsToNull {
     if (Object.keys(request.body).length > 0) {
       request.body = Object.assign(
         ...Object.keys(request.body).map(key => ({
-          [key]: request.body[key] !== '' ? request.body[key] : null,
+          [key]: request.body[key] === '' ? null : request.body[key],
         })),
       );
     }
diff --git a/src/internal-server/start/migrate.js b/src/internal-server/start/migrate.js
index 0af33a977..4cd502c3f 100644
--- a/src/internal-server/start/migrate.js
+++ b/src/internal-server/start/migrate.js
@@ -21,13 +21,13 @@ module.exports = async () => {
 
   const user = await User.find(1);
   let settings;
-  if (!user) {
+  if (user) {
+    settings = convertToJSON(user.settings);
+  } else {
     migrateLog("🎩  Migrating from old Ferdium version as user doesn't exist");
 
     // Create new user
     await Database.raw('INSERT INTO  "users" ("id") VALUES (\'1\');');
-  } else {
-    settings = convertToJSON(user.settings);
   }
 
   if (
diff --git a/src/internal-server/test.ts b/src/internal-server/test.ts
index 5bb1f2b36..6949df79e 100644
--- a/src/internal-server/test.ts
+++ b/src/internal-server/test.ts
@@ -6,4 +6,5 @@ const dummyUserFolder = join(__dirname, 'user_data');
 
 ensureDirSync(dummyUserFolder);
 
+// eslint-disable-next-line unicorn/prefer-top-level-await
 server(dummyUserFolder, 46_568, 'test').catch(console.log);
-- 
cgit v1.2.3-70-g09d2