From d0f26c0182ffc6259d83c7a1348e732405bc0158 Mon Sep 17 00:00:00 2001
From: Josh Patra <joshpatra12@gmail.com>
Date: Mon, 2 Feb 2026 15:57:34 -0500
Subject: [PATCH] Artists, not artist

---
 .../Jellyfin/JellyfinResponseBuilder.cs       | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/allstarr/Services/Jellyfin/JellyfinResponseBuilder.cs b/allstarr/Services/Jellyfin/JellyfinResponseBuilder.cs
index a030e5d..806b503 100644
--- a/allstarr/Services/Jellyfin/JellyfinResponseBuilder.cs
+++ b/allstarr/Services/Jellyfin/JellyfinResponseBuilder.cs
@@ -243,14 +243,22 @@ public class JellyfinResponseBuilder
             ["AlbumId"] = song.AlbumId ?? song.Id,
             ["AlbumArtist"] = song.AlbumArtist ?? song.Artist,
             ["Artists"] = song.Artists.Count > 0 ? song.Artists.ToArray() : new[] { song.Artist },
-            ["ArtistItems"] = new[]
-            {
-                new Dictionary<string, object?>
+            ["ArtistItems"] = song.Artists.Count > 0 
+                ? song.Artists.Select((name, index) => new Dictionary<string, object?>
                 {
-                    ["Id"] = song.ArtistId ?? song.Id,
-                    ["Name"] = song.Artist
-                }
-            },
+                    ["Name"] = name,
+                    ["Id"] = index == 0 && song.ArtistId != null 
+                        ? song.ArtistId 
+                        : $"{song.Id}-artist-{index}"
+                }).ToArray()
+                : new[]
+                {
+                    new Dictionary<string, object?>
+                    {
+                        ["Id"] = song.ArtistId ?? song.Id,
+                        ["Name"] = song.Artist
+                    }
+                },
             ["IndexNumber"] = song.Track,
             ["ParentIndexNumber"] = song.DiscNumber ?? 1,
             ["ProductionYear"] = song.Year,