From d5d995de5f16dd0cb9cad028bd1389c0d2cec45f Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Sun, 28 Dec 2025 13:34:26 -0800
Subject: [PATCH] fix missing musicFolderId on search (#1451)

---
 src/renderer/api/controller.ts                   | 6 +++++-
 src/renderer/api/subsonic/subsonic-controller.ts | 3 +++
 src/shared/api/subsonic/subsonic-types.ts        | 1 -
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/renderer/api/controller.ts b/src/renderer/api/controller.ts
index ff7e09ba9..82ea43ac1 100644
--- a/src/renderer/api/controller.ts
+++ b/src/renderer/api/controller.ts
@@ -521,7 +521,11 @@ export const controller: GeneralController = {
         return apiController(
             'getRandomSongList',
             server.type,
-        )?.({ ...args, apiClientProps: { ...args.apiClientProps, server } });
+        )?.({
+            ...args,
+            apiClientProps: { ...args.apiClientProps, server },
+            query: mergeMusicFolderId(args.query, server),
+        });
     },
     getRoles(args) {
         const server = getServerById(args.apiClientProps.serverId);
diff --git a/src/renderer/api/subsonic/subsonic-controller.ts b/src/renderer/api/subsonic/subsonic-controller.ts
index 41795203c..2f3cd14fb 100644
--- a/src/renderer/api/subsonic/subsonic-controller.ts
+++ b/src/renderer/api/subsonic/subsonic-controller.ts
@@ -354,6 +354,7 @@ export const SubsonicController: InternalControllerEndpoint = {
                     albumOffset: query.startIndex,
                     artistCount: 0,
                     artistOffset: 0,
+                    musicFolderId: getLibraryId(query.musicFolderId),
                     query: query.searchTerm || '',
                     songCount: 0,
                     songOffset: 0,
@@ -509,6 +510,7 @@ export const SubsonicController: InternalControllerEndpoint = {
                         albumOffset: startIndex,
                         artistCount: 0,
                         artistOffset: 0,
+                        musicFolderId: getLibraryId(query.musicFolderId),
                         query: query.searchTerm || '',
                         songCount: 0,
                         songOffset: 0,
@@ -1784,6 +1786,7 @@ export const SubsonicController: InternalControllerEndpoint = {
                 albumOffset: query.albumStartIndex,
                 artistCount: query.albumArtistLimit,
                 artistOffset: query.albumArtistStartIndex,
+                musicFolderId: getLibraryId(query.musicFolderId),
                 query: query.query,
                 songCount: query.songLimit,
                 songOffset: query.songStartIndex,
diff --git a/src/shared/api/subsonic/subsonic-types.ts b/src/shared/api/subsonic/subsonic-types.ts
index 399396d61..081ce2217 100644
--- a/src/shared/api/subsonic/subsonic-types.ts
+++ b/src/shared/api/subsonic/subsonic-types.ts
@@ -416,7 +416,6 @@ const getSongsByGenre = z.object({
 
 const getAlbumParameters = z.object({
     id: z.string(),
-    musicFolderId: z.string().optional(),
 });
 
 const getAlbum = z.object({