Merge pull request #10649 from felix920506/issue-10610

Make "activeWithinSeconds" independent from "controllableByUserId" parameter

1 files changed, 6 insertions, 6 deletions

diff --git a/Jellyfin.Api/Controllers/SessionController.cs b/Jellyfin.Api/Controllers/SessionController.cs
index f0e578e7a..fdebb3d45 100644
--- a/Jellyfin.Api/Controllers/SessionController.cs
+++ b/Jellyfin.Api/Controllers/SessionController.cs
@@ -91,12 +91,6 @@ public class SessionController : BaseJellyfinApiController
                 result = result.Where(i => !i.UserId.Equals(default));
             }
 
-            if (activeWithinSeconds.HasValue && activeWithinSeconds.Value > 0)
-            {
-                var minActiveDate = DateTime.UtcNow.AddSeconds(0 - activeWithinSeconds.Value);
-                result = result.Where(i => i.LastActivityDate >= minActiveDate);
-            }
-
             result = result.Where(i =>
             {
                 if (!string.IsNullOrWhiteSpace(i.DeviceId))
@@ -111,6 +105,12 @@ public class SessionController : BaseJellyfinApiController
             });
         }
 
+        if (activeWithinSeconds.HasValue && activeWithinSeconds.Value > 0)
+        {
+            var minActiveDate = DateTime.UtcNow.AddSeconds(0 - activeWithinSeconds.Value);
+            result = result.Where(i => i.LastActivityDate >= minActiveDate);
+        }
+
         return Ok(result);
     }