瀏覽代碼

Merge pull request #10649 from felix920506/issue-10610

Make "activeWithinSeconds" independent from "controllableByUserId" parameter
Cody Robibero 1 年之前
父節點
當前提交
7ebb4d3b24
共有 1 個文件被更改,包括 6 次插入6 次删除
  1. 6 6
      Jellyfin.Api/Controllers/SessionController.cs

+ 6 - 6
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);
     }