Fix rate limit issues for playlist downloading (bsmg#326)

* Fix inconsistent use of UTC and local time, changed display to local time.
knah · Apr 14, 2021 · 7788c25 · 7788c25
1 parent ab775ea
commit 7788c25
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/ModAssistant/Classes/External Interfaces/BeatSaver.cs b/ModAssistant/Classes/External Interfaces/BeatSaver.cs
@@ -89,7 +89,7 @@ private static async Task<BeatSaverApiResponse> GetResponse(string url, bool sho
 
                 if ((int)resp.StatusCode == 429)
                 {
-                    Utils.SetMessage($"{string.Format((string)Application.Current.FindResource("OneClick:RatelimitHit"), response.ratelimit.ResetTime)}");
+                    Utils.SetMessage($"{string.Format((string)Application.Current.FindResource("OneClick:RatelimitHit"), response.ratelimit.ResetTime.ToLocalTime())}");
                     await response.ratelimit.Wait();
                     return await GetResponse(url, showNotification, retries - 1);
                 }
@@ -240,7 +240,7 @@ public static async Task Download(string url, string output, int retries = 3)
             if ((int)resp.StatusCode == 429)
             {
                 var ratelimit = GetRatelimit(resp.Headers);
-                Utils.SetMessage($"{string.Format((string)Application.Current.FindResource("OneClick:RatelimitHit"), ratelimit.ResetTime)}");
+                Utils.SetMessage($"{string.Format((string)Application.Current.FindResource("OneClick:RatelimitHit"), ratelimit.ResetTime.ToLocalTime())}");
 
                 await ratelimit.Wait();
                 await Download(url, output, retries - 1);
@@ -276,7 +276,7 @@ public class BeatSaverRatelimit
             public DateTime ResetTime { get; set; }
             public async Task Wait()
             {
-                await Task.Delay(new TimeSpan(ResetTime.Ticks - DateTime.Now.Ticks));
+                await Task.Delay(new TimeSpan(Math.Max(ResetTime.Ticks - DateTime.UtcNow.Ticks, 0)));
             }
         }