From e0c5f80b68ed0ade4120fca813a2e9d6c78cc611 Mon Sep 17 00:00:00 2001
From: Zamitto <167933696+zamitto@users.noreply.github.com>
Date: Mon, 9 Jun 2025 08:40:31 -0300
Subject: [PATCH] feat: refactor

---
 .../achievement-watcher-manager.ts            | 13 ----------
 .../achievements/find-achivement-files.ts     |  5 +++-
 .../achievements/get-game-achievement-data.ts | 26 -------------------
 3 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/src/main/services/achievements/achievement-watcher-manager.ts b/src/main/services/achievements/achievement-watcher-manager.ts
index e4aa1b1c..b862abbe 100644
--- a/src/main/services/achievements/achievement-watcher-manager.ts
+++ b/src/main/services/achievements/achievement-watcher-manager.ts
@@ -66,10 +66,6 @@ const watchAchievementsWithWine = async () => {
 
   for (const game of games) {
     const gameAchievementFiles = findAchievementFiles(game);
-    const achievementFileInsideDirectory =
-      findAchievementFileInExecutableDirectory(game);
-
-    gameAchievementFiles.push(...achievementFileInsideDirectory);
 
     gameAchievementFiles.push(...(await findAchievementFileInSteamPath(game)));
 
@@ -181,11 +177,6 @@ export class AchievementWatcherManager {
 
     const gameAchievementFiles = findAchievementFiles(game);
 
-    const achievementFileInsideDirectory =
-      findAchievementFileInExecutableDirectory(game);
-
-    gameAchievementFiles.push(...achievementFileInsideDirectory);
-
     gameAchievementFiles.push(...(await findAchievementFileInSteamPath(game)));
 
     const unlockedAchievements: UnlockedAchievement[] = [];
@@ -299,10 +290,6 @@ export class AchievementWatcherManager {
     return Promise.all(
       games.map(async (game) => {
         const achievementFiles = findAchievementFiles(game);
-        const achievementFileInsideDirectory =
-          findAchievementFileInExecutableDirectory(game);
-
-        achievementFiles.push(...achievementFileInsideDirectory);
 
         achievementFiles.push(...(await findAchievementFileInSteamPath(game)));
 
diff --git a/src/main/services/achievements/find-achivement-files.ts b/src/main/services/achievements/find-achivement-files.ts
index c6b3a6fc..183f6ba9 100644
--- a/src/main/services/achievements/find-achivement-files.ts
+++ b/src/main/services/achievements/find-achivement-files.ts
@@ -271,7 +271,10 @@ export const findAchievementFiles = (game: Game) => {
     }
   }
 
-  return achievementFiles;
+  const achievementFileInsideDirectory =
+    findAchievementFileInExecutableDirectory(game);
+
+  return achievementFiles.concat(achievementFileInsideDirectory);
 };
 
 const steamUserIds = await getSteamUsersIds();
diff --git a/src/main/services/achievements/get-game-achievement-data.ts b/src/main/services/achievements/get-game-achievement-data.ts
index 214735c2..e2b663d8 100644
--- a/src/main/services/achievements/get-game-achievement-data.ts
+++ b/src/main/services/achievements/get-game-achievement-data.ts
@@ -19,32 +19,6 @@ const getModifiedSinceHeader = (
     : undefined;
 };
 
-const getModifiedSinceHeader = async (
-  cachedAchievements: GameAchievement | undefined
-): Promise<Date | undefined> => {
-  const hasActiveSubscription = await db
-    .get<string, User>(levelKeys.user, { valueEncoding: "json" })
-    .then((user) => {
-      const expiresAt = new Date(user?.subscription?.expiresAt ?? 0);
-      return expiresAt > new Date();
-    });
-
-  if (!cachedAchievements) {
-    return undefined;
-  }
-
-  const hasAchievementsPoints =
-    cachedAchievements.achievements[0].points != undefined;
-
-  if (hasActiveSubscription !== hasAchievementsPoints) {
-    return undefined;
-  }
-
-  return cachedAchievements.updatedAt
-    ? new Date(cachedAchievements.updatedAt)
-    : undefined;
-};
-
 export const getGameAchievementData = async (
   objectId: string,
   shop: GameShop,