Fixed: Simplify DateTime alteration

src/NzbDrone.Core/HealthCheck/HealthCheckService.cs

@@ -55,7 +55,7 @@ public HealthCheckService(IEnumerable<IProvideHealthCheck> healthChecks,
             _startupHealthChecks = _healthChecks.Where(v => v.CheckOnStartup).ToArray();
             _scheduledHealthChecks = _healthChecks.Where(v => v.CheckOnSchedule).ToArray();
             _eventDrivenHealthChecks = GetEventDrivenHealthChecks();
-            _startupGracePeriodEndTime = runtimeInfo.StartTime + TimeSpan.FromMinutes(15);
+            _startupGracePeriodEndTime = runtimeInfo.StartTime.AddMinutes(15);
         }
 
         public List<HealthCheck> Results()

src/NzbDrone.Core/Indexers/Definitions/Anidub.cs

@@ -72,7 +72,7 @@ protected override async Task DoLogin()
 
             if (response.Content != null && !CheckIfLoginNeeded(response))
             {
-                UpdateCookies(response.GetCookies(), DateTime.Now + TimeSpan.FromDays(30));
+                UpdateCookies(response.GetCookies(), DateTime.Now.AddDays(30));
                 _logger.Debug("Anidub authentication succeeded");
             }
             else

src/NzbDrone.Core/Indexers/Definitions/AnimeTorrents.cs

@@ -71,7 +71,7 @@ protected override async Task DoLogin()
 
             if (response.Content != null && response.Content.Contains("logout.php"))
             {
-                UpdateCookies(response.GetCookies(), DateTime.Now + TimeSpan.FromDays(30));
+                UpdateCookies(response.GetCookies(), DateTime.Now.AddDays(30));
 
                 _logger.Debug("AnimeTorrents authentication succeeded");
             }

src/NzbDrone.Core/Indexers/Definitions/Anthelion.cs

@@ -80,7 +80,7 @@ protected override async Task DoLogin()
             }
 
             cookies = response.GetCookies();
-            UpdateCookies(cookies, DateTime.Now + TimeSpan.FromDays(30));
+            UpdateCookies(cookies, DateTime.Now.AddDays(30));
 
             _logger.Debug("Anthelion authentication succeeded.");
         }

src/NzbDrone.Core/Indexers/Definitions/BB.cs

@@ -87,7 +87,7 @@ protected override async Task DoLogin()
             }
 
             cookies = response.GetCookies();
-            UpdateCookies(cookies, DateTime.Now + TimeSpan.FromDays(30));
+            UpdateCookies(cookies, DateTime.Now.AddDays(30));
 
             _logger.Debug("BB authentication succeeded.");
         }

src/NzbDrone.Core/Indexers/Definitions/BakaBT.cs

@@ -100,7 +100,7 @@ protected override async Task DoLogin()
 
             if (response.Content != null && response.Content.Contains("<a href=\"logout.php\">Logout</a>"))
             {
-                UpdateCookies(response.GetCookies(), DateTime.Now + TimeSpan.FromDays(30));
+                UpdateCookies(response.GetCookies(), DateTime.Now.AddDays(30));
 
                 _logger.Debug("BakaBT authentication succeeded");
             }

src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs

@@ -226,7 +226,7 @@ public async Task DoLogin()
 
                 CheckForError(response, login.Error);
 
-                CookiesUpdater(Cookies, DateTime.Now + TimeSpan.FromDays(30));
+                CookiesUpdater(Cookies, DateTime.Now.AddDays(30));
             }
             else if (login.Method == "form")
             {
@@ -467,13 +467,13 @@ public async Task DoLogin()
 
                 Cookies = loginResult.GetCookies();
                 CheckForError(loginResult, login.Error);
-                CookiesUpdater(Cookies, DateTime.Now + TimeSpan.FromDays(30));
+                CookiesUpdater(Cookies, DateTime.Now.AddDays(30));
             }
             else if (login.Method == "cookie")
             {
                 CookiesUpdater(null, null);
                 Settings.ExtraFieldData.TryGetValue("cookie", out var cookies);
-                CookiesUpdater(CookieUtil.CookieHeaderToDictionary((string)cookies), DateTime.Now + TimeSpan.FromDays(30));
+                CookiesUpdater(CookieUtil.CookieHeaderToDictionary((string)cookies), DateTime.Now.AddDays(30));
             }
             else if (login.Method == "get")
             {
@@ -504,7 +504,7 @@ public async Task DoLogin()
 
                 CheckForError(response, login.Error);
 
-                CookiesUpdater(Cookies, DateTime.Now + TimeSpan.FromDays(30));
+                CookiesUpdater(Cookies, DateTime.Now.AddDays(30));
             }
             else if (login.Method == "oneurl")
             {
@@ -529,7 +529,7 @@ public async Task DoLogin()
 
                 CheckForError(response, login.Error);
 
-                CookiesUpdater(Cookies, DateTime.Now + TimeSpan.FromDays(30));
+                CookiesUpdater(Cookies, DateTime.Now.AddDays(30));
             }
             else
             {

src/NzbDrone.Core/Indexers/Definitions/FunFile.cs

@@ -78,7 +78,7 @@ protected override async Task DoLogin()
         }
 
         var cookies = response.GetCookies();
-        UpdateCookies(cookies, DateTime.Now + TimeSpan.FromDays(30));
+        UpdateCookies(cookies, DateTime.Now.AddDays(30));
 
         _logger.Debug("Authentication succeeded.");
     }

src/NzbDrone.Core/Indexers/Definitions/Gazelle/GazelleBase.cs

@@ -56,7 +56,7 @@ protected override async Task DoLogin()
         CheckForLoginError(response);
 
         cookies = response.GetCookies();
-        UpdateCookies(cookies, DateTime.Now + TimeSpan.FromDays(30));
+        UpdateCookies(cookies, DateTime.Now.AddDays(30));
 
         _logger.Debug("Gazelle authentication succeeded.");
     }

src/NzbDrone.Core/Indexers/Definitions/HDSpace.cs

@@ -84,7 +84,7 @@ protected override async Task DoLogin()
             }
 
             cookies = response.GetCookies();
-            UpdateCookies(cookies, DateTime.Now + TimeSpan.FromDays(30));
+            UpdateCookies(cookies, DateTime.Now.AddDays(30));
 
             _logger.Debug("HDSpace authentication succeeded.");
         }

src/NzbDrone.Core/Indexers/Definitions/HDTorrents.cs

@@ -71,7 +71,7 @@ protected override async Task DoLogin()
             var response = await ExecuteAuth(authLoginRequest);
 
             cookies = response.GetCookies();
-            UpdateCookies(cookies, DateTime.Now + TimeSpan.FromDays(30));
+            UpdateCookies(cookies, DateTime.Now.AddDays(30));
 
             _logger.Debug("HDTorrents authentication succeeded.");
         }

src/NzbDrone.Core/Indexers/Definitions/ImmortalSeed.cs

@@ -72,7 +72,7 @@ protected override async Task DoLogin()
             }
 
             var cookies = response.GetCookies();
-            UpdateCookies(cookies, DateTime.Now + TimeSpan.FromDays(30));
+            UpdateCookies(cookies, DateTime.Now.AddDays(30));
 
             _logger.Debug("ImmortalSeed authentication succeeded.");
         }

src/NzbDrone.Core/Indexers/Definitions/Libble.cs

@@ -84,7 +84,7 @@ protected override async Task DoLogin()
         }
 
         cookies = response.GetCookies();
-        UpdateCookies(cookies, DateTime.Now + TimeSpan.FromDays(30));
+        UpdateCookies(cookies, DateTime.Now.AddDays(30));
 
         _logger.Debug("Authentication succeeded.");
     }

src/NzbDrone.Core/Indexers/Definitions/NorBits.cs

@@ -95,7 +95,7 @@ protected override async Task DoLogin()
         }
 
         var cookies = loginResponse.GetCookies();
-        UpdateCookies(cookies, DateTime.Now + TimeSpan.FromDays(30));
+        UpdateCookies(cookies, DateTime.Now.AddDays(30));
 
         _logger.Debug("Authentication succeeded.");
     }

src/NzbDrone.Core/Indexers/Definitions/PassThePopcorn/PassThePopcornRequestGenerator.cs

@@ -66,7 +66,7 @@ private IEnumerable<IndexerRequest> GetRequest(string searchParameters)
                     request.HttpRequest.Cookies[cookie.Key] = cookie.Value;
                 }
 
-                CookiesUpdater(Cookies, DateTime.Now + TimeSpan.FromDays(30));
+                CookiesUpdater(Cookies, DateTime.Now.AddDays(30));
             }
 
             yield return request;

src/NzbDrone.Core/Indexers/Definitions/PirateTheNet.cs

@@ -83,7 +83,7 @@ protected override async Task DoLogin()
         }
 
         var cookies = response.GetCookies();
-        UpdateCookies(cookies, DateTime.Now + TimeSpan.FromDays(30));
+        UpdateCookies(cookies, DateTime.Now.AddDays(30));
 
         _logger.Debug("Authentication succeeded.");
     }
@@ -275,7 +275,7 @@ public IList<ReleaseInfo> ParseResponse(IndexerResponse indexerResponse)
             }
             else if (added.StartsWith("Yesterday "))
             {
-                release.PublishDate = DateTime.Now.Date + DateTime.ParseExact(added.Split(" ", 2).Last(), "hh:mm tt", CultureInfo.InvariantCulture).TimeOfDay - TimeSpan.FromDays(1);
+                release.PublishDate = DateTime.Now.AddDays(-1).Date + DateTime.ParseExact(added.Split(" ", 2).Last(), "hh:mm tt", CultureInfo.InvariantCulture).TimeOfDay;
             }
             else
             {

src/NzbDrone.Core/Indexers/Definitions/PornoLab.cs

@@ -74,7 +74,7 @@ protected override async Task DoLogin()
                 throw new IndexerAuthException(errorMessage ?? "Unknown error message, please report");
             }
 
-            UpdateCookies(response.GetCookies(), DateTime.Now + TimeSpan.FromDays(30));
+            UpdateCookies(response.GetCookies(), DateTime.Now.AddDays(30));
 
             _logger.Debug("Authentication succeeded");
         }

src/NzbDrone.Core/Indexers/Definitions/PreToMe.cs

@@ -92,7 +92,7 @@ protected override async Task DoLogin()
             throw new IndexerAuthException(errorMessage ?? "Unknown error message, please report.");
         }
 
-        UpdateCookies(response.GetCookies(), DateTime.Now + TimeSpan.FromDays(30));
+        UpdateCookies(response.GetCookies(), DateTime.Now.AddDays(30));
 
         _logger.Debug("Authentication succeeded");
     }

src/NzbDrone.Core/Indexers/Definitions/RevolutionTT.cs

@@ -69,7 +69,7 @@ protected override async Task DoLogin()
 
             if (response.Content != null && response.Content.Contains("/logout.php"))
             {
-                UpdateCookies(response.GetCookies(), DateTime.Now + TimeSpan.FromDays(30));
+                UpdateCookies(response.GetCookies(), DateTime.Now.AddDays(30));
 
                 _logger.Debug("RevolutionTT authentication succeeded");
             }

src/NzbDrone.Core/Indexers/Definitions/RuTracker.cs

@@ -76,7 +76,7 @@ protected override async Task DoLogin()
             }
 
             cookies = response.GetCookies();
-            UpdateCookies(cookies, DateTime.Now + TimeSpan.FromDays(30));
+            UpdateCookies(cookies, DateTime.Now.AddDays(30));
 
             _logger.Debug("Authentication succeeded");
         }

src/NzbDrone.Core/Indexers/Definitions/Shazbat.cs

@@ -86,7 +86,7 @@ protected override async Task DoLogin()
         }
 
         var cookies = response.GetCookies();
-        UpdateCookies(cookies, DateTime.Now + TimeSpan.FromDays(30));
+        UpdateCookies(cookies, DateTime.Now.AddDays(30));
 
         _logger.Debug("Authentication succeeded.");
     }

src/NzbDrone.Core/Indexers/Definitions/SpeedCD.cs

@@ -108,7 +108,7 @@ protected override async Task DoLogin()
         }
 
         var cookies = response.GetCookies();
-        UpdateCookies(cookies, DateTime.Now + TimeSpan.FromDays(30));
+        UpdateCookies(cookies, DateTime.Now.AddDays(30));
 
         _logger.Debug("Authentication succeeded.");
     }

src/NzbDrone.Core/Indexers/Definitions/TVVault.cs

@@ -83,7 +83,7 @@ protected override async Task DoLogin()
             }
 
             cookies = response.GetCookies();
-            UpdateCookies(cookies, DateTime.Now + TimeSpan.FromDays(30));
+            UpdateCookies(cookies, DateTime.Now.AddDays(30));
 
             _logger.Debug("TVVault authentication succeeded.");
         }

src/NzbDrone.Core/Indexers/Definitions/Toloka.cs

@@ -86,7 +86,7 @@ protected override async Task DoLogin()
             }
 
             var cookies = response.GetCookies();
-            UpdateCookies(cookies, DateTime.Now + TimeSpan.FromDays(30));
+            UpdateCookies(cookies, DateTime.Now.AddDays(30));
 
             _logger.Debug("Toloka.to authentication succeeded.");
         }

src/NzbDrone.Core/Indexers/Definitions/TorrentBytes.cs

@@ -79,7 +79,7 @@ protected override async Task DoLogin()
             }
 
             cookies = response.GetCookies();
-            UpdateCookies(cookies, DateTime.Now + TimeSpan.FromDays(30));
+            UpdateCookies(cookies, DateTime.Now.AddDays(30));
 
             _logger.Debug("TorrentBytes authentication succeeded.");
         }

src/NzbDrone.Core/Indexers/Definitions/XSpeeds.cs

@@ -84,7 +84,7 @@ protected override async Task DoLogin()
         }
 
         var cookies = response.GetCookies();
-        UpdateCookies(cookies, DateTime.Now + TimeSpan.FromDays(30));
+        UpdateCookies(cookies, DateTime.Now.AddDays(30));
 
         _logger.Debug("Authentication succeeded.");
     }

src/NzbDrone.Core/Indexers/Definitions/ZonaQ.cs

@@ -130,7 +130,7 @@ protected override async Task DoLogin()
 
             response = await ExecuteAuth(authLoginRequest3);
 
-            UpdateCookies(response.GetCookies(), DateTime.Now + TimeSpan.FromDays(30));
+            UpdateCookies(response.GetCookies(), DateTime.Now.AddDays(30));
         }
 
         private static string Sha1Hash(string input)

src/NzbDrone.Core/Indexers/HttpIndexerBase.cs

@@ -406,7 +406,7 @@ protected virtual async Task<IndexerResponse> FetchIndexerResponse(IndexerReques
                 throw new CloudFlareProtectionException(response);
             }
 
-            UpdateCookies(request.HttpRequest.Cookies, DateTime.Now + TimeSpan.FromDays(30));
+            UpdateCookies(request.HttpRequest.Cookies, DateTime.Now.AddDays(30));
 
             return new IndexerResponse(request, response);
         }

src/NzbDrone.Core/Indexers/IndexerStatusService.cs

@@ -37,7 +37,7 @@ public IDictionary<string, string> GetIndexerCookies(int indexerId)
 
         public DateTime GetIndexerCookiesExpirationDate(int indexerId)
         {
-            return GetProviderStatus(indexerId)?.CookiesExpirationDate ?? DateTime.Now + TimeSpan.FromDays(12);
+            return GetProviderStatus(indexerId)?.CookiesExpirationDate ?? DateTime.Now.AddDays(12);
         }
 
         public void UpdateRssSyncStatus(int indexerId, ReleaseInfo releaseInfo)

src/NzbDrone.Core/ThingiProvider/Status/ProviderStatusServiceBase.cs

@@ -116,7 +116,7 @@ protected virtual void RecordFailure(int providerId, TimeSpan minimumBackOff, bo
 
                 if (inStartupGracePeriod && minimumBackOff == TimeSpan.Zero && status.DisabledTill.HasValue)
                 {
-                    var maximumDisabledTill = now + TimeSpan.FromSeconds(EscalationBackOff.Periods[1]);
+                    var maximumDisabledTill = now.AddSeconds(EscalationBackOff.Periods[1]);
                     if (maximumDisabledTill < status.DisabledTill)
                     {
                         status.DisabledTill = maximumDisabledTill;