Merge branch 'feature/profile-redesign' of github.com:hydralauncher/hydra into feature/profile-redesign

src/main/events/library/add-game-to-library.ts

@@ -54,7 +54,7 @@ const addGameToLibrary = async (
 
       const game = await gameRepository.findOne({ where: { objectID } });
 
-      createGame(game!);
+      createGame(game!).catch(() => {});
     });
 };
 

src/main/events/torrenting/start-game-download.ts

@@ -97,7 +97,7 @@ const startGameDownload = async (
     },
   });
 
-  createGame(updatedGame!);
+  createGame(updatedGame!).catch(() => {});
 
   await downloadQueueRepository.delete({ game: { id: updatedGame!.id } });
   await downloadQueueRepository.insert({ game: { id: updatedGame!.id } });

src/main/knex-client.ts

@@ -2,12 +2,13 @@ import knex, { Knex } from "knex";
 import { databasePath } from "./constants";
 import { Hydra2_0_3 } from "./migrations/20240830143811_Hydra_2_0_3";
 import { RepackUris } from "./migrations/20240830143906_RepackUris";
+import { UpdateUserLanguage } from "./migrations/20240913213944_update_user_language";
 
 export type HydraMigration = Knex.Migration & { name: string };
 
 class MigrationSource implements Knex.MigrationSource<HydraMigration> {
   getMigrations(): Promise<HydraMigration[]> {
-    return Promise.resolve([Hydra2_0_3, RepackUris]);
+    return Promise.resolve([Hydra2_0_3, RepackUris, UpdateUserLanguage]);
   }
   getMigrationName(migration: HydraMigration): string {
     return migration.name;

src/main/migrations/20240913213944_update_user_language.ts

@@ -0,0 +1,13 @@
+import type { HydraMigration } from "@main/knex-client";
+import type { Knex } from "knex";
+
+export const UpdateUserLanguage: HydraMigration = {
+  name: "UpdateUserLanguage",
+  up: async (knex: Knex) => {
+    await knex("user_preferences")
+      .update("language", "pt-BR")
+      .where("language", "pt");
+  },
+
+  down: async (_knex: Knex) => {},
+};

src/main/services/library-sync/create-game.ts

@@ -4,26 +4,28 @@ import { gameRepository } from "@main/repository";
 import { logger } from "../logger";
 
 export const createGame = async (game: Game) => {
-  HydraApi.post("/games/download", {
+  HydraApi.post(
-    objectId: game.objectID,
+    "/games/download",
-    shop: game.shop,
+    {
-  }).catch((err) => {
+      objectId: game.objectID,
+      shop: game.shop,
+    },
+    { needsAuth: false }
+  ).catch((err) => {
     logger.error("Failed to create game download", err);
   });
 
-  HydraApi.post(`/profile/games`, {
+  return HydraApi.post(`/profile/games`, {
     objectId: game.objectID,
     playTimeInMilliseconds: Math.trunc(game.playTimeInMilliseconds),
     shop: game.shop,
     lastTimePlayed: game.lastTimePlayed,
-  })
+  }).then((response) => {
-    .then((response) => {
+    const { id: remoteId, playTimeInMilliseconds, lastTimePlayed } = response;
-      const { id: remoteId, playTimeInMilliseconds, lastTimePlayed } = response;
 
-      gameRepository.update(
+    gameRepository.update(
-        { objectID: game.objectID },
+      { objectID: game.objectID },
-        { remoteId, playTimeInMilliseconds, lastTimePlayed }
+      { remoteId, playTimeInMilliseconds, lastTimePlayed }
-      );
+    );
-    })
+  });
-    .catch(() => {});
 };

src/main/services/library-sync/update-game-playtime.ts

@@ -6,8 +6,8 @@ export const updateGamePlaytime = async (
   deltaInMillis: number,
   lastTimePlayed: Date
 ) => {
-  HydraApi.put(`/profile/games/${game.remoteId}`, {
+  return HydraApi.put(`/profile/games/${game.remoteId}`, {
     playTimeDeltaInSeconds: Math.trunc(deltaInMillis / 1000),
     lastTimePlayed,
-  }).catch(() => {});
+  });
 };

src/main/services/process-watcher.ts

@@ -70,9 +70,9 @@ function onOpenGame(game: Game) {
   });
 
   if (game.remoteId) {
-    updateGamePlaytime(game, 0, new Date());
+    updateGamePlaytime(game, 0, new Date()).catch(() => {});
   } else {
-    createGame({ ...game, lastTimePlayed: new Date() });
+    createGame({ ...game, lastTimePlayed: new Date() }).catch(() => {});
   }
 }
 
@@ -93,20 +93,22 @@ function onTickGame(game: Game) {
   });
 
   if (currentTick % TICKS_TO_UPDATE_API === 0) {
-    if (game.remoteId) {
+    const gamePromise = game.remoteId
-      updateGamePlaytime(
+      ? updateGamePlaytime(
-        game,
+          game,
-        now - gamePlaytime.lastSyncTick,
+          now - gamePlaytime.lastSyncTick,
-        game.lastTimePlayed!
+          game.lastTimePlayed!
-      );
+        )
-    } else {
+      : createGame(game);
-      createGame(game);
-    }
 
-    gamesPlaytime.set(game.id, {
+    gamePromise
-      ...gamePlaytime,
+      .then(() => {
-      lastSyncTick: now,
+        gamesPlaytime.set(game.id, {
-    });
+          ...gamePlaytime,
+          lastSyncTick: now,
+        });
+      })
+      .catch(() => {});
   }
 }
 
@@ -119,8 +121,8 @@ const onCloseGame = (game: Game) => {
       game,
       performance.now() - gamePlaytime.firstTick,
       game.lastTimePlayed!
-    );
+    ).catch(() => {});
   } else {
-    createGame(game);
+    createGame(game).catch(() => {});
   }
 };

src/renderer/src/main.tsx

@@ -41,8 +41,11 @@ i18n
       escapeValue: false,
     },
   })
-  .then(() => {
+  .then(async () => {
-    window.electron.updateUserPreferences({ language: i18n.language });
+    const userPreferences = await window.electron.getUserPreferences();
+    if (!userPreferences?.language) {
+      window.electron.updateUserPreferences({ language: i18n.language });
+    }
   });
 
 ReactDOM.createRoot(document.getElementById("root")!).render(