From af3db7603b086cee6b9fc090fba3a19769818468 Mon Sep 17 00:00:00 2001
From: Matthew Haughton <3flex@users.noreply.github.com>
Date: Sun, 10 Nov 2024 21:03:52 +1100
Subject: [PATCH] Remove userId where not required

---
 src/components/maincontroller.ts |  8 ++------
 src/helpers.ts                   | 26 ++++++++------------------
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/src/components/maincontroller.ts b/src/components/maincontroller.ts
index c4acc8a7..586600f0 100644
--- a/src/components/maincontroller.ts
+++ b/src/components/maincontroller.ts
@@ -565,11 +565,7 @@ export async function translateItems(
 ): Promise<void> {
     const playNow = method != 'PlayNext' && method != 'PlayLast';
 
-    const result = await translateRequestedItems(
-        data.userId,
-        options.items,
-        playNow
-    );
+    const result = await translateRequestedItems(options.items, playNow);
 
     if (result.Items) {
         options.items = result.Items;
@@ -616,7 +612,7 @@ export async function shuffle(
     options: PlayRequest,
     item: BaseItemDto
 ): Promise<void> {
-    const result = await getShuffleItems(data.userId, item);
+    const result = await getShuffleItems(item);
 
     options.items = result.Items ?? [];
     PlaybackManager.playFromOptions(data.options);
diff --git a/src/helpers.ts b/src/helpers.ts
index 41bf6bc4..fd24b118 100644
--- a/src/helpers.ts
+++ b/src/helpers.ts
@@ -479,14 +479,10 @@ const requiredItemFields: ItemFields[] = ['MediaSources', 'Chapters'];
  * of the provided one.
  *
  * It's used only in maincomponents.shuffle.
- *
- * TODO: JellyfinApi.userId should be fine for this.
- * @param userId - User ID to look up items with
  * @param item - Parent item of shuffle search
  * @returns items for the queue
  */
 export function getShuffleItems(
-    userId: string,
     item: BaseItemDto
 ): Promise<BaseItemDtoQueryResult> {
     const query: ItemsApiGetItemsRequest = {
@@ -515,7 +511,7 @@ export function getShuffleItems(
         };
     }
 
-    return getItemsForPlayback(userId, {
+    return getItemsForPlayback({
         ...query,
         ...additionalParams
     });
@@ -564,20 +560,17 @@ export async function getInstantMixItems(
 
 /**
  * Get items to be played back
- * @param userId - user for the search
  * @param query - specification on what to search for
  * @returns items to be played back
  */
 export async function getItemsForPlayback(
-    userId: string,
     query: ItemsApiGetItemsRequest
 ): Promise<BaseItemDtoQueryResult> {
     const response = await getItemsApi(JellyfinApi.jellyfinApi).getItems({
         ...query,
         excludeLocationTypes: ['Virtual'],
         fields: requiredItemFields,
-        limit: query.limit ?? 100,
-        userId
+        limit: query.limit ?? 100
     });
 
     return response.data;
@@ -612,25 +605,23 @@ export function getUser(): Promise<UserDto> {
 /**
  * Process a list of items for playback
  * by resolving things like folders to playable items.
- * @param userId - userId to use
  * @param items - items to resolve
  * @param smart - If enabled it will try to find the next episode given the current one,
  * if the connected user has enabled that in their settings
  * @returns Promise for search result containing items to play
  */
 export async function translateRequestedItems(
-    userId: string,
     items: BaseItemDto[],
     smart = false
 ): Promise<BaseItemDtoQueryResult> {
     const firstItem = items[0];
 
     if (firstItem.Type == 'Playlist') {
-        return await getItemsForPlayback(userId, {
+        return await getItemsForPlayback({
             parentId: firstItem.Id
         });
     } else if (firstItem.Type == 'MusicArtist') {
-        return await getItemsForPlayback(userId, {
+        return await getItemsForPlayback({
             artistIds: firstItem.Id ? [firstItem.Id] : undefined,
             filters: ['IsNotFolder'],
             mediaTypes: ['Audio'],
@@ -638,7 +629,7 @@ export async function translateRequestedItems(
             sortBy: ['SortName']
         });
     } else if (firstItem.Type == 'MusicGenre') {
-        return await getItemsForPlayback(userId, {
+        return await getItemsForPlayback({
             filters: ['IsNotFolder'],
             genres: firstItem.Name ? [firstItem.Name] : undefined,
             mediaTypes: ['Audio'],
@@ -646,7 +637,7 @@ export async function translateRequestedItems(
             sortBy: ['SortName']
         });
     } else if (firstItem.IsFolder) {
-        return await getItemsForPlayback(userId, {
+        return await getItemsForPlayback({
             filters: ['IsNotFolder'],
             mediaTypes: ['Audio', 'Video'],
             parentId: firstItem.Id,
@@ -662,7 +653,7 @@ export async function translateRequestedItems(
             };
         }
 
-        const result = await getItemsForPlayback(userId, {
+        const result = await getItemsForPlayback({
             ids: firstItem.Id ? [firstItem.Id] : undefined
         });
 
@@ -678,8 +669,7 @@ export async function translateRequestedItems(
 
         const episodesResult = await getEpisodesForPlayback({
             isMissing: false,
-            seriesId: episode.SeriesId,
-            userId: userId
+            seriesId: episode.SeriesId
         });
 
         let foundItem = false;