Merge branch 'main' into feature/game-achievements

# Conflicts:
#	src/renderer/src/context/game-details/game-details.context.tsx
#	src/renderer/src/main.tsx

src/main/events/catalogue/get-catalogue.ts

@@ -1,8 +1,8 @@
 import type { GameShop } from "@types";
 
 import { registerEvent } from "../register-event";
-import { HydraApi, RepacksManager } from "@main/services";
-import { CatalogueCategory, formatName, steamUrlBuilder } from "@shared";
+import { HydraApi } from "@main/services";
+import { CatalogueCategory, steamUrlBuilder } from "@shared";
 import { steamGamesWorker } from "@main/workers";
 
 const getCatalogue = async (
@@ -26,14 +26,9 @@ const getCatalogue = async (
         name: "getById",
       });
 
-      const repacks = RepacksManager.search({
-        query: formatName(steamGame.name),
-      });
-
       return {
         title: steamGame.name,
         shop: game.shop,
-        repacks,
         cover: steamUrlBuilder.library(game.objectId),
         objectID: game.objectId,
       };

src/main/events/catalogue/get-game-shop-details.ts

@@ -45,15 +45,17 @@ const getGameShopDetails = async (
 
     const appDetails = getLocalizedSteamAppDetails(objectID, language).then(
       (result) => {
-        gameShopCacheRepository.upsert(
-          {
-            objectID,
-            shop: "steam",
-            language,
-            serializedData: JSON.stringify(result),
-          },
-          ["objectID"]
-        );
+        if (result) {
+          gameShopCacheRepository.upsert(
+            {
+              objectID,
+              shop: "steam",
+              language,
+              serializedData: JSON.stringify(result),
+            },
+            ["objectID"]
+          );
+        }
 
         return result;
       }

src/main/events/catalogue/get-games.ts

@@ -2,8 +2,7 @@ import type { CatalogueEntry } from "@types";
 
 import { registerEvent } from "../register-event";
 import { steamGamesWorker } from "@main/workers";
-import { convertSteamGameToCatalogueEntry } from "../helpers/search-games";
-import { RepacksManager } from "@main/services";
+import { steamUrlBuilder } from "@shared";
 
 const getGames = async (
   _event: Electron.IpcMainInvokeEvent,
@@ -15,13 +14,14 @@ const getGames = async (
     { name: "list" }
   );
 
-  const entries = RepacksManager.findRepacksForCatalogueEntries(
-    steamGames.map((game) => convertSteamGameToCatalogueEntry(game))
-  );
-
   return {
-    results: entries,
-    cursor: cursor + entries.length,
+    results: steamGames.map((steamGame) => ({
+      title: steamGame.name,
+      shop: "steam",
+      cover: steamUrlBuilder.library(steamGame.id),
+      objectID: steamGame.id,
+    })),
+    cursor: cursor + steamGames.length,
   };
 };
 

src/main/events/catalogue/get-random-game.ts

@@ -3,32 +3,15 @@ import { shuffle } from "lodash-es";
 import { getSteam250List } from "@main/services";
 
 import { registerEvent } from "../register-event";
-import { getSteamGameById } from "../helpers/search-games";
 import type { Steam250Game } from "@types";
 
 const state = { games: Array<Steam250Game>(), index: 0 };
 
-const filterGames = async (games: Steam250Game[]) => {
-  const results: Steam250Game[] = [];
-
-  for (const game of games) {
-    const steamGame = await getSteamGameById(game.objectID);
-
-    if (steamGame?.repacks.length) {
-      results.push(game);
-    }
-  }
-
-  return results;
-};
-
 const getRandomGame = async (_event: Electron.IpcMainInvokeEvent) => {
   if (state.games.length == 0) {
     const steam250List = await getSteam250List();
 
-    const filteredSteam250List = await filterGames(steam250List);
-
-    state.games = shuffle(filteredSteam250List);
+    state.games = shuffle(steam250List);
   }
 
   if (state.games.length == 0) {

src/main/events/catalogue/search-game-repacks.ts

@@ -1,9 +0,0 @@
-import { RepacksManager } from "@main/services";
-import { registerEvent } from "../register-event";
-
-const searchGameRepacks = (
-  _event: Electron.IpcMainInvokeEvent,
-  query: string
-) => RepacksManager.search({ query });
-
-registerEvent("searchGameRepacks", searchGameRepacks);

src/main/events/catalogue/search-games.ts

@@ -1,7 +1,7 @@
 import { registerEvent } from "../register-event";
 import { convertSteamGameToCatalogueEntry } from "../helpers/search-games";
 import { CatalogueEntry } from "@types";
-import { HydraApi, RepacksManager } from "@main/services";
+import { HydraApi } from "@main/services";
 
 const searchGamesEvent = async (
   _event: Electron.IpcMainInvokeEvent,
@@ -11,15 +11,13 @@ const searchGamesEvent = async (
     { objectId: string; title: string; shop: string }[]
   >("/games/search", { title: query, take: 12, skip: 0 }, { needsAuth: false });
 
-  const steamGames = games.map((game) => {
+  return games.map((game) => {
     return convertSteamGameToCatalogueEntry({
       id: Number(game.objectId),
       name: game.title,
       clientIcon: null,
     });
   });
-
-  return RepacksManager.findRepacksForCatalogueEntries(steamGames);
 };
 
 registerEvent("searchGames", searchGamesEvent);

src/main/events/download-sources/add-download-source.ts

@@ -1,42 +0,0 @@
-import { registerEvent } from "../register-event";
-import { dataSource } from "@main/data-source";
-import { DownloadSource } from "@main/entity";
-import axios from "axios";
-import { downloadSourceSchema } from "../helpers/validators";
-import { insertDownloadsFromSource } from "@main/helpers";
-import { RepacksManager } from "@main/services";
-
-const addDownloadSource = async (
-  _event: Electron.IpcMainInvokeEvent,
-  url: string
-) => {
-  const response = await axios.get(url);
-
-  const source = downloadSourceSchema.parse(response.data);
-
-  const downloadSource = await dataSource.transaction(
-    async (transactionalEntityManager) => {
-      const downloadSource = await transactionalEntityManager
-        .getRepository(DownloadSource)
-        .save({
-          url,
-          name: source.name,
-          downloadCount: source.downloads.length,
-        });
-
-      await insertDownloadsFromSource(
-        transactionalEntityManager,
-        downloadSource,
-        source.downloads
-      );
-
-      return downloadSource;
-    }
-  );
-
-  await RepacksManager.updateRepacks();
-
-  return downloadSource;
-};
-
-registerEvent("addDownloadSource", addDownloadSource);

src/main/events/download-sources/delete-download-source.ts

@@ -0,0 +1,9 @@
+import { registerEvent } from "../register-event";
+import { knexClient } from "@main/knex-client";
+
+const deleteDownloadSource = async (
+  _event: Electron.IpcMainInvokeEvent,
+  id: number
+) => knexClient("download_source").where({ id }).delete();
+
+registerEvent("deleteDownloadSource", deleteDownloadSource);

src/main/events/download-sources/get-download-sources.ts

@@ -1,11 +1,7 @@
-import { downloadSourceRepository } from "@main/repository";
 import { registerEvent } from "../register-event";
+import { knexClient } from "@main/knex-client";
 
 const getDownloadSources = async (_event: Electron.IpcMainInvokeEvent) =>
-  downloadSourceRepository.find({
-    order: {
-      createdAt: "DESC",
-    },
-  });
+  knexClient.select("*").from("download_source");
 
 registerEvent("getDownloadSources", getDownloadSources);

src/main/events/download-sources/remove-download-source.ts

@@ -1,13 +0,0 @@
-import { downloadSourceRepository } from "@main/repository";
-import { registerEvent } from "../register-event";
-import { RepacksManager } from "@main/services";
-
-const removeDownloadSource = async (
-  _event: Electron.IpcMainInvokeEvent,
-  id: number
-) => {
-  await downloadSourceRepository.delete(id);
-  await RepacksManager.updateRepacks();
-};
-
-registerEvent("removeDownloadSource", removeDownloadSource);

src/main/events/download-sources/sync-download-sources.ts

@@ -1,7 +0,0 @@
-import { registerEvent } from "../register-event";
-import { fetchDownloadSourcesAndUpdate } from "@main/helpers";
-
-const syncDownloadSources = async (_event: Electron.IpcMainInvokeEvent) =>
-  fetchDownloadSourcesAndUpdate();
-
-registerEvent("syncDownloadSources", syncDownloadSources);

src/main/events/download-sources/validate-download-source.ts

@@ -1,27 +0,0 @@
-import { registerEvent } from "../register-event";
-import { downloadSourceRepository } from "@main/repository";
-import { RepacksManager } from "@main/services";
-import { downloadSourceWorker } from "@main/workers";
-
-const validateDownloadSource = async (
-  _event: Electron.IpcMainInvokeEvent,
-  url: string
-) => {
-  const existingSource = await downloadSourceRepository.findOne({
-    where: { url },
-  });
-
-  if (existingSource)
-    throw new Error("Source with the same url already exists");
-
-  const repacks = RepacksManager.repacks;
-
-  return downloadSourceWorker.run(
-    { url, repacks },
-    {
-      name: "validateDownloadSource",
-    }
-  );
-};
-
-registerEvent("validateDownloadSource", validateDownloadSource);

src/main/events/helpers/search-games.ts

@@ -1,7 +1,6 @@
 import type { GameShop, CatalogueEntry, SteamGame } from "@types";
 
 import { steamGamesWorker } from "@main/workers";
-import { RepacksManager } from "@main/services";
 import { steamUrlBuilder } from "@shared";
 
 export interface SearchGamesArgs {
@@ -17,7 +16,6 @@ export const convertSteamGameToCatalogueEntry = (
   title: game.name,
   shop: "steam" as GameShop,
   cover: steamUrlBuilder.library(String(game.id)),
-  repacks: [],
 });
 
 export const getSteamGameById = async (
@@ -29,9 +27,5 @@ export const getSteamGameById = async (
 
   if (!steamGame) return null;
 
-  const catalogueEntry = convertSteamGameToCatalogueEntry(steamGame);
-
-  const result = RepacksManager.findRepacksForCatalogueEntry(catalogueEntry);
-
-  return result;
+  return convertSteamGameToCatalogueEntry(steamGame);
 };

src/main/events/helpers/validators.ts

@@ -1,13 +0,0 @@
-import { z } from "zod";
-
-export const downloadSourceSchema = z.object({
-  name: z.string().max(255),
-  downloads: z.array(
-    z.object({
-      title: z.string().max(255),
-      uris: z.array(z.string()),
-      uploadDate: z.string().max(255),
-      fileSize: z.string().max(255),
-    })
-  ),
-});

src/main/events/index.ts

@@ -7,7 +7,6 @@ import "./catalogue/get-games";
 import "./catalogue/get-how-long-to-beat";
 import "./catalogue/get-random-game";
 import "./catalogue/search-games";
-import "./catalogue/search-game-repacks";
 import "./catalogue/get-game-stats";
 import "./catalogue/get-trending-games";
 import "./catalogue/get-game-achievements";
@@ -38,11 +37,8 @@ import "./user-preferences/auto-launch";
 import "./autoupdater/check-for-updates";
 import "./autoupdater/restart-and-install-update";
 import "./user-preferences/authenticate-real-debrid";
+import "./download-sources/delete-download-source";
 import "./download-sources/get-download-sources";
-import "./download-sources/validate-download-source";
-import "./download-sources/add-download-source";
-import "./download-sources/remove-download-source";
-import "./download-sources/sync-download-sources";
 import "./auth/sign-out";
 import "./auth/open-auth-window";
 import "./auth/get-session-hash";
@@ -61,6 +57,7 @@ import "./profile/update-profile";
 import "./profile/process-profile-image";
 import "./profile/send-friend-request";
 import "./profile/sync-friend-requests";
+import "./notifications/publish-new-repacks-notification";
 import { isPortableVersion } from "@main/helpers";
 
 ipcMain.handle("ping", () => "pong");

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

@@ -3,7 +3,6 @@ import { gameRepository } from "@main/repository";
 import { registerEvent } from "../register-event";
 
 import type { GameShop } from "@types";
-import { getFileBase64 } from "@main/helpers";
 
 import { steamGamesWorker } from "@main/workers";
 import { createGame } from "@main/services/library-sync";
@@ -37,20 +36,12 @@ const addGameToLibrary = async (
           ? steamUrlBuilder.icon(objectID, steamGame.clientIcon)
           : null;
 
-        await gameRepository
-          .insert({
-            title,
-            iconUrl,
-            objectID,
-            shop,
-          })
-          .then(() => {
-            if (iconUrl) {
-              getFileBase64(iconUrl).then((base64) =>
-                gameRepository.update({ objectID }, { iconUrl: base64 })
-              );
-            }
-          });
+        await gameRepository.insert({
+          title,
+          iconUrl,
+          objectID,
+          shop,
+        });
       }
 
       updateLocalUnlockedAchivements(true, objectID);

src/main/events/notifications/publish-new-repacks-notification.ts

@@ -0,0 +1,29 @@
+import { Notification } from "electron";
+import { registerEvent } from "../register-event";
+import { userPreferencesRepository } from "@main/repository";
+import { t } from "i18next";
+
+const publishNewRepacksNotification = async (
+  _event: Electron.IpcMainInvokeEvent,
+  newRepacksCount: number
+) => {
+  if (newRepacksCount < 1) return;
+
+  const userPreferences = await userPreferencesRepository.findOne({
+    where: { id: 1 },
+  });
+
+  if (userPreferences?.repackUpdatesNotificationsEnabled) {
+    new Notification({
+      title: t("repack_list_updated", {
+        ns: "notifications",
+      }),
+      body: t("repack_count", {
+        ns: "notifications",
+        count: newRepacksCount,
+      }),
+    }).show();
+  }
+};
+
+registerEvent("publishNewRepacksNotification", publishNewRepacksNotification);

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

@@ -1,7 +1,6 @@
 import { registerEvent } from "../register-event";
 
 import type { StartGameDownloadPayload } from "@types";
-import { getFileBase64 } from "@main/helpers";
 import { DownloadManager, HydraApi, logger } from "@main/services";
 
 import { Not } from "typeorm";
@@ -9,36 +8,25 @@ import { steamGamesWorker } from "@main/workers";
 import { createGame } from "@main/services/library-sync";
 import { steamUrlBuilder } from "@shared";
 import { dataSource } from "@main/data-source";
-import { DownloadQueue, Game, Repack } from "@main/entity";
+import { DownloadQueue, Game } from "@main/entity";
 
 const startGameDownload = async (
   _event: Electron.IpcMainInvokeEvent,
   payload: StartGameDownloadPayload
 ) => {
-  const { repackId, objectID, title, shop, downloadPath, downloader, uri } =
-    payload;
+  const { objectID, title, shop, downloadPath, downloader, uri } = payload;
 
   return dataSource.transaction(async (transactionalEntityManager) => {
     const gameRepository = transactionalEntityManager.getRepository(Game);
-    const repackRepository = transactionalEntityManager.getRepository(Repack);
     const downloadQueueRepository =
       transactionalEntityManager.getRepository(DownloadQueue);
 
-    const [game, repack] = await Promise.all([
-      gameRepository.findOne({
-        where: {
-          objectID,
-          shop,
-        },
-      }),
-      repackRepository.findOne({
-        where: {
-          id: repackId,
-        },
-      }),
-    ]);
-
-    if (!repack) return;
+    const game = await gameRepository.findOne({
+      where: {
+        objectID,
+        shop,
+      },
+    });
 
     await DownloadManager.pauseDownload();
 
@@ -71,26 +59,16 @@ const startGameDownload = async (
         ? steamUrlBuilder.icon(objectID, steamGame.clientIcon)
         : null;
 
-      await gameRepository
-        .insert({
-          title,
-          iconUrl,
-          objectID,
-          downloader,
-          shop,
-          status: "active",
-          downloadPath,
-          uri,
-        })
-        .then((result) => {
-          if (iconUrl) {
-            getFileBase64(iconUrl).then((base64) =>
-              gameRepository.update({ objectID }, { iconUrl: base64 })
-            );
-          }
-
-          return result;
-        });
+      await gameRepository.insert({
+        title,
+        iconUrl,
+        objectID,
+        downloader,
+        shop,
+        status: "active",
+        downloadPath,
+        uri,
+      });
     }
 
     const updatedGame = await gameRepository.findOne({

src/main/events/user/get-user.ts

@@ -73,7 +73,6 @@ const getUser = async (
       recentGames,
     };
   } catch (err) {
-    console.log(err);
     return null;
   }
 };