Merge branch 'main' into feat/disabling-update-badges

src/main/services/download/download-manager.ts

@@ -20,7 +20,7 @@ import { RealDebridClient } from "./real-debrid";
 import path from "path";
 import { logger } from "../logger";
 import { db, downloadsSublevel, gamesSublevel, levelKeys } from "@main/level";
-import { sortBy } from "lodash-es";
+import { orderBy } from "lodash-es";
 import { TorBoxClient } from "./torbox";
 import { GameFilesManager } from "../game-files-manager";
 import { HydraDebridClient } from "./hydra-debrid";
@@ -194,10 +194,10 @@ export class DownloadManager {
           .values()
           .all()
           .then((games) => {
-            return sortBy(
+            return orderBy(
               games.filter((game) => game.status === "paused" && game.queued),
               "timestamp",
-              "DESC"
+              "desc"
             );
           });
 

src/main/services/hydra-api.ts

@@ -30,7 +30,7 @@ export class HydraApi {
   private static instance: AxiosInstance;
 
   private static readonly EXPIRATION_OFFSET_IN_MS = 1000 * 60 * 5; // 5 minutes
-  private static readonly ADD_LOG_INTERCEPTOR = true;
+  private static readonly ADD_LOG_INTERCEPTOR = false;
 
   private static secondsToMilliseconds(seconds: number) {
     return seconds * 1000;
@@ -58,7 +58,13 @@ export class HydraApi {
     const decodedBase64 = atob(payload as string);
     const jsonData = JSON.parse(decodedBase64);
 
-    const { accessToken, expiresIn, refreshToken } = jsonData;
+    const {
+      accessToken,
+      expiresIn,
+      refreshToken,
+      featurebaseJwt,
+      workwondersJwt,
+    } = jsonData;
 
     const now = new Date();
 
@@ -85,6 +91,8 @@ export class HydraApi {
         accessToken,
         refreshToken,
         tokenExpirationTimestamp,
+        featurebaseJwt,
+        workwondersJwt,
       },
       { valueEncoding: "json" }
     );

src/main/services/system-path.ts

@@ -13,9 +13,9 @@ export class SystemPath {
   };
 
   static checkIfPathsAreAvailable() {
-    const paths = Object.keys(SystemPath.paths) as Array<
-      keyof typeof SystemPath.paths
-    >;
+    const paths = Object.keys(
+      SystemPath.paths
+    ) as (keyof typeof SystemPath.paths)[];
 
     paths.forEach((pathName) => {
       try {

src/main/services/window-manager.ts

@@ -138,7 +138,8 @@ export class WindowManager {
       (details, callback) => {
         if (
           details.webContentsId !== this.mainWindow?.webContents.id ||
-          details.url.includes("chatwoot")
+          details.url.includes("chatwoot") ||
+          details.url.includes("workwonders")
         ) {
           return callback(details);
         }
@@ -159,7 +160,8 @@ export class WindowManager {
         if (
           details.webContentsId !== this.mainWindow?.webContents.id ||
           details.url.includes("featurebase") ||
-          details.url.includes("chatwoot")
+          details.url.includes("chatwoot") ||
+          details.url.includes("workwonders")
         ) {
           return callback(details);
         }