Merge branch 'main' of https://github.com/hydralauncher/hydra into release/v3.7.2

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

@@ -6,6 +6,10 @@ import { gamesShopAssetsSublevel, levelKeys } from "@main/level";
 const LOCAL_CACHE_EXPIRATION = 1000 * 60 * 60 * 8; // 8 hours
 
 export const getGameAssets = async (objectId: string, shop: GameShop) => {
+  if (shop === "custom") {
+    return null;
+  }
+
   const cachedAssets = await gamesShopAssetsSublevel.get(
     levelKeys.game(shop, objectId)
   );

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

@@ -26,6 +26,8 @@ const getGameShopDetails = async (
   shop: GameShop,
   language: string
 ): Promise<ShopDetailsWithAssets | null> => {
+  if (shop === "custom") return null;
+
   if (shop === "steam") {
     const [cachedData, cachedAssets] = await Promise.all([
       gamesShopCacheSublevel.get(

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

@@ -10,6 +10,10 @@ const getGameStats = async (
   objectId: string,
   shop: GameShop
 ) => {
+  if (shop === "custom") {
+    return null;
+  }
+
   const cachedStats = await gamesStatsCacheSublevel.get(
     levelKeys.game(shop, objectId)
   );

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

@@ -13,7 +13,9 @@ const addGameToFavorites = async (
   const game = await gamesSublevel.get(gameKey);
   if (!game) return;
 
-  HydraApi.put(`/profile/games/${shop}/${objectId}/favorite`).catch(() => {});
+  if (shop !== "custom") {
+    HydraApi.put(`/profile/games/${shop}/${objectId}/favorite`).catch(() => {});
+  }
 
   try {
     await gamesSublevel.put(gameKey, {

src/main/events/library/remove-game-from-favorites.ts

@@ -13,7 +13,11 @@ const removeGameFromFavorites = async (
   const game = await gamesSublevel.get(gameKey);
   if (!game) return;
 
-  HydraApi.put(`/profile/games/${shop}/${objectId}/unfavorite`).catch(() => {});
+  if (shop !== "custom") {
+    HydraApi.put(`/profile/games/${shop}/${objectId}/unfavorite`).catch(
+      () => {}
+    );
+  }
 
   try {
     await gamesSublevel.put(gameKey, {

src/main/events/library/remove-game-from-library.ts

@@ -84,7 +84,7 @@ const removeGameFromLibrary = async (
     await resetShopAssets(gameKey);
   }
 
-  if (game?.remoteId) {
+  if (game.remoteId) {
     HydraApi.delete(`/profile/games/${game.remoteId}`).catch(() => {});
   }
 

src/main/services/achievements/get-game-achievement-data.ts

@@ -27,6 +27,10 @@ export const getGameAchievementData = async (
   shop: GameShop,
   useCachedData: boolean
 ) => {
+  if (shop === "custom") {
+    return [];
+  }
+
   const gameKey = levelKeys.game(shop, objectId);
 
   const cachedAchievements = await gameAchievementsSublevel.get(gameKey);

src/renderer/src/components/text-field/text-field.tsx

@@ -1,16 +1,13 @@
-import React, { useId, useMemo, useState } from "react";
+import React, { useId, useState } from "react";
 import { EyeClosedIcon, EyeIcon } from "@primer/octicons-react";
 import { useTranslation } from "react-i18next";
-
 import cn from "classnames";
-
 import "./text-field.scss";
 
-export interface TextFieldProps
-  extends React.DetailedHTMLProps<
-    React.InputHTMLAttributes<HTMLInputElement>,
-    HTMLInputElement
-  > {
+export interface TextFieldProps extends React.DetailedHTMLProps<
+  React.InputHTMLAttributes<HTMLInputElement>,
+  HTMLInputElement
+> {
   theme?: "primary" | "dark";
   label?: string | React.ReactNode;
   hint?: string | React.ReactNode;
@@ -42,44 +39,27 @@ export const TextField = React.forwardRef<HTMLInputElement, TextFieldProps>(
   ) => {
     const id = useId();
     const [isFocused, setIsFocused] = useState(false);
-
     const [isPasswordVisible, setIsPasswordVisible] = useState(false);
-
     const { t } = useTranslation("forms");
-
     const showPasswordToggleButton = props.type === "password";
-
-    const inputType = useMemo(() => {
-      if (props.type === "password" && isPasswordVisible) return "text";
-      return props.type ?? "text";
-    }, [props.type, isPasswordVisible]);
-
-    const hintContent = useMemo(() => {
-      if (error)
-        return (
-          <small className="text-field-container__error-label">{error}</small>
-        );
-
-      if (hint) return <small>{hint}</small>;
-      return null;
-    }, [hint, error]);
-
+    const inputType = props.type === "password" && isPasswordVisible ? "text" : props.type ?? "text";
+    const hintContent = error ? (
+      <small className="text-field-container__error-label">{error}</small>
+    ) : hint ? (
+      <small>{hint}</small>
+    ) : null;
     const handleFocus: React.FocusEventHandler<HTMLInputElement> = (event) => {
       setIsFocused(true);
-      if (props.onFocus) props.onFocus(event);
+      props.onFocus?.(event);
     };
-
     const handleBlur: React.FocusEventHandler<HTMLInputElement> = (event) => {
       setIsFocused(false);
-      if (props.onBlur) props.onBlur(event);
+      props.onBlur?.(event);
     };
-
     const hasError = !!error;
-
     return (
       <div className="text-field-container" {...containerProps}>
         {label && <label htmlFor={id}>{label}</label>}
-
         <div className="text-field-container__text-field-wrapper">
           <div
             className={cn(
@@ -104,7 +84,6 @@ export const TextField = React.forwardRef<HTMLInputElement, TextFieldProps>(
               onBlur={handleBlur}
               type={inputType}
             />
-
             {showPasswordToggleButton && (
               <button
                 type="button"
@@ -120,14 +99,11 @@ export const TextField = React.forwardRef<HTMLInputElement, TextFieldProps>(
               </button>
             )}
           </div>
-
           {rightContent}
         </div>
-
         {hintContent}
       </div>
     );
   }
 );
-
-TextField.displayName = "TextField";
+TextField.displayName = "TextField";

src/renderer/src/context/cloud-sync/cloud-sync.context.tsx

@@ -98,6 +98,11 @@ export function CloudSyncContextProvider({
   );
 
   const getGameArtifacts = useCallback(async () => {
+    if (shop === "custom") {
+      setArtifacts([]);
+      return;
+    }
+
     const params = new URLSearchParams({
       objectId,
       shop,

src/renderer/src/context/game-details/game-details.context.tsx

@@ -130,10 +130,12 @@ export function GameDetailsContextProvider({
         }
       });
 
-    window.electron.getGameStats(objectId, shop).then((result) => {
-      if (abortController.signal.aborted) return;
-      setStats(result);
-    });
+    if (shop !== "custom") {
+      window.electron.getGameStats(objectId, shop).then((result) => {
+        if (abortController.signal.aborted) return;
+        setStats(result);
+      });
+    }
 
     const assetsPromise = window.electron.getGameAssets(objectId, shop);
 
@@ -155,7 +157,7 @@ export function GameDetailsContextProvider({
         setIsLoading(false);
       });
 
-    if (userDetails) {
+    if (userDetails && shop !== "custom") {
       window.electron
         .getUnlockedAchievements(objectId, shop)
         .then((achievements) => {

src/renderer/src/pages/game-details/game-details-content.tsx

@@ -228,7 +228,7 @@ export function GameDetailsContent() {
               </button>
             )}
 
-            {game?.shop !== "custom" && shop && objectId && (
+            {shop !== "custom" && shop && objectId && (
               <GameReviews
                 shop={shop}
                 objectId={objectId}
@@ -241,7 +241,7 @@ export function GameDetailsContent() {
             )}
           </div>
 
-          {game?.shop !== "custom" && <Sidebar />}
+          {shop !== "custom" && <Sidebar />}
         </div>
       </section>
 

src/renderer/src/pages/game-details/game-reviews.tsx

@@ -117,7 +117,7 @@ export function GameReviews({
   });
 
   const checkUserReview = useCallback(async () => {
-    if (!objectId || !userDetailsId) return;
+    if (!objectId || !userDetailsId || shop === "custom") return;
 
     try {
       const response = await window.electron.hydraApi.get<{
@@ -147,7 +147,7 @@ export function GameReviews({
 
   const loadReviews = useCallback(
     async (reset = false) => {
-      if (!objectId) return;
+      if (!objectId || shop === "custom") return;
 
       if (abortControllerRef.current) {
         abortControllerRef.current.abort();

src/renderer/src/pages/game-details/hero.scss

@@ -146,6 +146,8 @@ $hero-height: 350px;
   &__game-logo {
     width: 200px;
     align-self: flex-end;
+    object-fit: contain;
+    object-position: left bottom;
 
     @media (min-width: 768px) {
       width: 250px;
@@ -153,6 +155,7 @@ $hero-height: 350px;
 
     @media (min-width: 1024px) {
       width: 300px;
+      max-height: 150px;
     }
   }
 

src/types/game.types.ts

@@ -1,4 +1,4 @@
-export type GameShop = "steam" | "epic" | "custom";
+export type GameShop = "steam" | "custom";
 
 export type ShortcutLocation = "desktop" | "start_menu";