From 259fe4522c4fdcd7467500780fc70ccd75108bf2 Mon Sep 17 00:00:00 2001
From: LJQ <leejunquan7@gmail.com>
Date: Tue, 17 Oct 2023 17:25:41 +0800
Subject: Update /Device endpoint to return CustomName

---
 Jellyfin.Server.Implementations/Devices/DeviceManager.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'Jellyfin.Server.Implementations')

diff --git a/Jellyfin.Server.Implementations/Devices/DeviceManager.cs b/Jellyfin.Server.Implementations/Devices/DeviceManager.cs
index a4b4c19599..80abe01abc 100644
--- a/Jellyfin.Server.Implementations/Devices/DeviceManager.cs
+++ b/Jellyfin.Server.Implementations/Devices/DeviceManager.cs
@@ -177,7 +177,7 @@ namespace Jellyfin.Server.Implementations.Devices
                     .OrderByDescending(d => d.DateLastActivity)
                     .ThenBy(d => d.DeviceId)
                     .AsAsyncEnumerable();
-
+                IAsyncEnumerable<DeviceOptions> deviceOptions = dbContext.DeviceOptions.AsAsyncEnumerable();
                 if (supportsSync.HasValue)
                 {
                     sessions = sessions.Where(i => GetCapabilities(i.DeviceId).SupportsSync == supportsSync.Value);
@@ -195,6 +195,14 @@ namespace Jellyfin.Server.Implementations.Devices
                 }
 
                 var array = await sessions.Select(device => ToDeviceInfo(device)).ToArrayAsync().ConfigureAwait(false);
+                await foreach (var deviceOption in deviceOptions)
+                {
+                    var deviceInfo = array.FirstOrDefault(d => d.Id.Equals(deviceOption.DeviceId, StringComparison.OrdinalIgnoreCase));
+                    if (deviceInfo != null)
+                    {
+                        deviceInfo.CustomName = deviceOption.CustomName;
+                    }
+                }
 
                 return new QueryResult<DeviceInfo>(array);
             }
-- 
cgit v1.2.3