Merge branch 'main' of github.com:hydralauncher/hydra

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

@@ -3,7 +3,7 @@ import { shuffle } from "lodash-es";
 import { getSteam250List } from "@main/services";
 
 import { registerEvent } from "../register-event";
-import { searchSteamGames } from "../helpers/search-games";
+import { getSteamGameById } from "../helpers/search-games";
 import type { Steam250Game } from "@types";
 
 const state = { games: Array<Steam250Game>(), index: 0 };
@@ -12,14 +12,10 @@ const filterGames = async (games: Steam250Game[]) => {
   const results: Steam250Game[] = [];
 
   for (const game of games) {
-    const catalogue = await searchSteamGames({ query: game.title });
+    const steamGame = await getSteamGameById(game.objectID);
 
-    if (catalogue.length) {
-      const [steamGame] = catalogue;
-
-      if (steamGame.repacks.length) {
-        results.push(game);
-      }
+    if (steamGame?.repacks.length) {
+      results.push(game);
     }
   }
 

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

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

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

@@ -1,6 +1,3 @@
-import { orderBy } from "lodash-es";
-import flexSearch from "flexsearch";
-
 import type { GameShop, CatalogueEntry, SteamGame } from "@types";
 
 import { steamGamesWorker } from "@main/workers";
@@ -23,20 +20,18 @@ export const convertSteamGameToCatalogueEntry = (
   repacks: [],
 });
 
-export const searchSteamGames = async (
-  options: flexSearch.SearchOptions
-): Promise<CatalogueEntry[]> => {
-  const steamGames = (await steamGamesWorker.run(options, {
-    name: "search",
-  })) as SteamGame[];
+export const getSteamGameById = async (
+  objectId: string
+): Promise<CatalogueEntry | null> => {
+  const steamGame = await steamGamesWorker.run(Number(objectId), {
+    name: "getById",
+  });
 
-  const result = RepacksManager.findRepacksForCatalogueEntries(
-    steamGames.map((game) => convertSteamGameToCatalogueEntry(game))
-  );
+  if (!steamGame) return null;
 
-  return orderBy(
-    result,
-    [({ repacks }) => repacks.length, "repacks"],
-    ["desc"]
-  );
+  const catalogueEntry = convertSteamGameToCatalogueEntry(steamGame);
+
+  const result = RepacksManager.findRepacksForCatalogueEntry(catalogueEntry);
+
+  return result;
 };