bumb to 1.4.17

[hotfix] fix issue where installed mods are not reflected in mods tab

release/app/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "bs-manager",
-  "version": "1.4.15",
+  "version": "1.4.17",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "bs-manager",
-      "version": "1.4.15",
+      "version": "1.4.17",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

release/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bs-manager",
-  "version": "1.4.15",
+  "version": "1.4.17",
   "description": "BSManager",
   "main": "./dist/main/main.js",
   "author": {

src/main/main.ts

@@ -29,7 +29,7 @@ export const filterPatterns = new Set<RegExp>();
 const isDebug = process.env.NODE_ENV === "development" || process.env.DEBUG_PROD === "true";
 
 // Filter all occulus tokens
-filterPatterns.add(/FRL\S{10,}/g);
+filterPatterns.add(/(FRL|OC)\S{10,}/g);
 
 initLogger();
 deleteOlestLogs();

src/main/services/mods/beat-mods-api.service.ts

@@ -26,7 +26,7 @@ export class BeatModsApiService {
     }
 
     private getVersionModsUrl(version: BSVersion): string {
-        const platform: BbmPlatform = version.oculus || version.metadata.store === BsStore.OCULUS ? BbmPlatform.OculusPC : BbmPlatform.SteamPC;
+        const platform: BbmPlatform = version.oculus || version.metadata?.store === BsStore.OCULUS ? BbmPlatform.OculusPC : BbmPlatform.SteamPC;
         return `${this.MODS_REPO_API_URL}/mods?status=verified&gameVersion=${version.BSVersion}&gameName=BeatSaber&platform=${platform}`;
     }
 

src/renderer/components/version-viewer/slides/mods/mod-item.component.tsx

@@ -9,6 +9,7 @@ import useDoubleClick from "use-double-click";
 import { gt } from "semver";
 import { useService } from "renderer/hooks/use-service.hook";
 import { BbmCategories, BbmFullMod } from "shared/models/mods/mod.interface";
+import striptags from "striptags";
 
 type Props = { className?: string; mod: BbmFullMod; installedVersion: string; isDependency?: boolean; isSelected?: boolean; onChange?: (val: boolean) => void; wantInfo?: boolean; onWantInfo?: (mod: BbmFullMod) => void };
 
@@ -59,8 +60,8 @@ export function ModItem({ className, mod, installedVersion, isDependency, isSele
             <span className="min-w-0 text-center bg-inherit py-2 px-1 text-sm border-t-2 border-b-2 group-hover:brightness-90" style={wantInfoStyle}>
                 {mod.version.modVersion}
             </span>
-            <span title={mod.mod.description} className="px-3 bg-inherit whitespace-nowrap text-ellipsis overflow-hidden py-2 text-sm border-t-2 border-b-2 group-hover:brightness-90" style={wantInfoStyle}>
-                {mod.mod.summary}
+            <span title={striptags(mod.mod?.description ?? "", { tagReplacementText: " " })} className="px-3 bg-inherit whitespace-nowrap text-ellipsis overflow-hidden py-2 text-sm border-t-2 border-b-2 group-hover:brightness-90" style={wantInfoStyle}>
+                {striptags(mod.mod?.summary ?? "", { tagReplacementText: " " })}
             </span>
             <div className="h-full bg-inherit flex items-center justify-center mr-3 rounded-r-md pr-2 border-t-2 border-b-2 border-r-2 group-hover:brightness-90" style={wantInfoStyle}>
                 {installedVersion && (

src/renderer/components/version-viewer/slides/mods/mods-slide.component.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useLayoutEffect, useRef, useState } from "react";
 import { BsModsManagerService } from "renderer/services/bs-mods-manager.service";
 import { BSVersion } from "shared/bs-version.interface";
-import { BbmCategories, BbmFullMod } from "shared/models/mods/mod.interface";
+import { BbmCategories, BbmFullMod, BbmModVersion } from "shared/models/mods/mod.interface";
 import { ModsGrid } from "./mods-grid.component";
 import { ConfigurationService } from "renderer/services/configuration.service";
 import { BsmButton } from "renderer/components/shared/bsm-button.component";
@@ -18,6 +18,7 @@ import { ModsDisclaimerModal } from "renderer/components/modal/modal-types/mods-
 import { OsDiagnosticService } from "renderer/services/os-diagnostic.service";
 import { lt } from "semver";
 import { useService } from "renderer/hooks/use-service.hook";
+import { logRenderError } from "renderer";
 
 export function ModsSlide({ version, onDisclamerDecline }: { version: BSVersion; onDisclamerDecline: () => void }) {
     const ACCEPTED_DISCLAIMER_KEY = "accepted-mods-disclaimer";
@@ -101,18 +102,24 @@ export function ModsSlide({ version, onDisclamerDecline }: { version: BSVersion;
             return;
         }
 
-        Promise.all([
-            lastValueFrom(modsManager.getAvailableMods(version)),
-            lastValueFrom(modsManager.getInstalledMods(version))
-        ]).then(([available, installed]) => {
+        const promise = async (): Promise<[BbmFullMod[], BbmModVersion[]]> => {
+            const available = await lastValueFrom(modsManager.getAvailableMods(version));
+            const installed = await lastValueFrom(modsManager.getInstalledMods(version));
+            return [available, installed];
+        }
+
+        promise().then(([available, installed]) => {
             const defaultMods = installed?.length ? [] : available.filter(m => m.mod.category === BbmCategories.Core || m.mod.category === BbmCategories.Essential);
             setModsAvailable(modsToCategoryMap(available));
             const installedMods: BbmFullMod[] = installed.map(version => {
-                const mod = available.find(m => m.mod.id === version.modId);
-                return mod ? { ...mod, version } : null;
-            });
+                    const mod = available.find(m => m.mod.id === version.modId);
+                    return mod ? { ...mod, version } : null;
+                }).filter(mod => mod);
+
             setModsSelected(available.filter(m => m.mod.category === BbmCategories.Core || defaultMods.some(d => m.mod.name.toLowerCase() === d.mod.name.toLowerCase()) || installedMods.some(i => m.mod.id === i.mod.id)));
             setModsInstalled(modsToCategoryMap(installedMods));
+        }).catch(e => {
+            logRenderError("Error occur while loading mods", e);
         });
     };
 
@@ -184,7 +191,7 @@ export function ModsSlide({ version, onDisclamerDecline }: { version: BSVersion;
         }
         return (
             <>
-                <div className="grow overflow-scroll w-full min-h-0 scrollbar-thin scrollbar-thumb-neutral-900 scrollbar-thumb-rounded-full">
+                <div className="grow overflow-y-scroll w-full min-h-0 scrollbar-default p-0 m-0">
                     <ModsGrid modsMap={modsAvailable} installed={modsInstalled} modsSelected={modsSelected} onModChange={handleModChange} moreInfoMod={moreInfoMod} onWantInfos={handleMoreInfo} unselectAllMods={unselectAllMods} />
                 </div>
                 <div className="h-10 shrink-0 flex items-center justify-between px-3">

src/renderer/index.css

@@ -132,3 +132,21 @@
         background-position: 0 0%;
     }
 }
+
+.scrollbar-default {
+
+
+    &::-webkit-scrollbar {
+        width: 4px;
+        height: 4px;
+    }
+
+    &::-webkit-scrollbar-track {
+        background-color: transparent;
+    }
+
+    &::-webkit-scrollbar-thumb {
+        background-color: rgb(23 23 23 / var(--tw-bg-opacity));
+        border-radius: 999px;
+      }
+}