diff options
author | Vijay A <vraravam@users.noreply.github.com> | 2023-05-24 06:57:50 +0530 |
---|---|---|
committer | Vijay Aravamudhan <vraravam@users.noreply.github.com> | 2023-05-24 16:40:43 +0530 |
commit | e245b4fa229bee1e2ab97fcb42de3831b8bdbe5b (patch) | |
tree | d684777b3fde5470c9f99304a9f022422ffb8045 /src/internal-server | |
parent | 6.3.0-nightly.9 [skip ci] (diff) | |
download | ferdium-app-e245b4fa229bee1e2ab97fcb42de3831b8bdbe5b.tar.gz ferdium-app-e245b4fa229bee1e2ab97fcb42de3831b8bdbe5b.tar.zst ferdium-app-e245b4fa229bee1e2ab97fcb42de3831b8bdbe5b.zip |
Upgrade npm modules
Diffstat (limited to 'src/internal-server')
-rw-r--r-- | src/internal-server/app/ImageHelper.js | 2 | ||||
-rw-r--r-- | src/internal-server/app/Middleware/ConvertEmptyStringsToNull.js | 2 | ||||
-rw-r--r-- | src/internal-server/start/migrate.js | 6 | ||||
-rw-r--r-- | src/internal-server/test.ts | 1 |
4 files changed, 6 insertions, 5 deletions
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 => { | |||
21 | name: iconId, | 21 | name: iconId, |
22 | overwrite: true, | 22 | overwrite: true, |
23 | }); | 23 | }); |
24 | return !icon.moved() ? '-1' : iconId; | 24 | return icon.moved() ? iconId : '-1'; |
25 | }; | 25 | }; |
26 | 26 | ||
27 | const deduceIconUrl = iconId => | 27 | 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 { | |||
3 | if (Object.keys(request.body).length > 0) { | 3 | if (Object.keys(request.body).length > 0) { |
4 | request.body = Object.assign( | 4 | request.body = Object.assign( |
5 | ...Object.keys(request.body).map(key => ({ | 5 | ...Object.keys(request.body).map(key => ({ |
6 | [key]: request.body[key] !== '' ? request.body[key] : null, | 6 | [key]: request.body[key] === '' ? null : request.body[key], |
7 | })), | 7 | })), |
8 | ); | 8 | ); |
9 | } | 9 | } |
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 () => { | |||
21 | 21 | ||
22 | const user = await User.find(1); | 22 | const user = await User.find(1); |
23 | let settings; | 23 | let settings; |
24 | if (!user) { | 24 | if (user) { |
25 | settings = convertToJSON(user.settings); | ||
26 | } else { | ||
25 | migrateLog("🎩 Migrating from old Ferdium version as user doesn't exist"); | 27 | migrateLog("🎩 Migrating from old Ferdium version as user doesn't exist"); |
26 | 28 | ||
27 | // Create new user | 29 | // Create new user |
28 | await Database.raw('INSERT INTO "users" ("id") VALUES (\'1\');'); | 30 | await Database.raw('INSERT INTO "users" ("id") VALUES (\'1\');'); |
29 | } else { | ||
30 | settings = convertToJSON(user.settings); | ||
31 | } | 31 | } |
32 | 32 | ||
33 | if ( | 33 | 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'); | |||
6 | 6 | ||
7 | ensureDirSync(dummyUserFolder); | 7 | ensureDirSync(dummyUserFolder); |
8 | 8 | ||
9 | // eslint-disable-next-line unicorn/prefer-top-level-await | ||
9 | server(dummyUserFolder, 46_568, 'test').catch(console.log); | 10 | server(dummyUserFolder, 46_568, 'test').catch(console.log); |