Merge pull request #10649 from felix920506/issue-10610

Make "activeWithinSeconds" independent from "controllableByUserId" parameter
pull/10526/head
Cody Robibero 7 months ago committed by GitHub
commit 7ebb4d3b24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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);
}

Loading…
Cancel
Save