浏览代码

Clea up IsParentalScheduleAllowed

Patrick Barron 5 年之前
父节点
当前提交
4cff9b8512
共有 1 个文件被更改,包括 4 次插入14 次删除
  1. 4 14
      Jellyfin.Data/Entities/User.cs

+ 4 - 14
Jellyfin.Data/Entities/User.cs

@@ -458,24 +458,14 @@ namespace Jellyfin.Data.Entities
             return GetPreference(PreferenceKind.GroupedFolders).Any(i => new Guid(i) == id);
             return GetPreference(PreferenceKind.GroupedFolders).Any(i => new Guid(i) == id);
         }
         }
 
 
-        private bool IsParentalScheduleAllowed(AccessSchedule schedule, DateTime date)
+        private static bool IsParentalScheduleAllowed(AccessSchedule schedule, DateTime date)
         {
         {
-            if (date.Kind != DateTimeKind.Utc)
-            {
-                throw new ArgumentException("Utc date expected");
-            }
-
             var localTime = date.ToLocalTime();
             var localTime = date.ToLocalTime();
-
-            return DayOfWeekHelper.GetDaysOfWeek(schedule.DayOfWeek).Contains(localTime.DayOfWeek) &&
-                   IsWithinTime(schedule, localTime);
-        }
-
-        private bool IsWithinTime(AccessSchedule schedule, DateTime localTime)
-        {
             var hour = localTime.TimeOfDay.TotalHours;
             var hour = localTime.TimeOfDay.TotalHours;
 
 
-            return hour >= schedule.StartHour && hour <= schedule.EndHour;
+            return DayOfWeekHelper.GetDaysOfWeek(schedule.DayOfWeek).Contains(localTime.DayOfWeek)
+                   && hour >= schedule.StartHour
+                   && hour <= schedule.EndHour;
         }
         }
 
 
         // TODO: make these user configurable?
         // TODO: make these user configurable?