From c0ce836701834c656ac0e57a15821e7bfe12d251 Mon Sep 17 00:00:00 2001 From: Shinryin <11825062+Shinryin@users.noreply.github.com> Date: Fri, 9 Aug 2024 15:44:12 -0500 Subject: [PATCH] New Bear Site Support (#24) * fix: update bear api to new site path * don't include microseconds in bear time field --------- Co-authored-by: ditzy --- ScoutHelper/Config/Configuration.cs | 2 +- ScoutHelper/Managers/BearManager.cs | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ScoutHelper/Config/Configuration.cs b/ScoutHelper/Config/Configuration.cs index 963413b..670ee44 100644 --- a/ScoutHelper/Config/Configuration.cs +++ b/ScoutHelper/Config/Configuration.cs @@ -16,7 +16,7 @@ public class Configuration : IPluginConfiguration { public int Version { get; set; } = 0; - public string BearApiBaseUrl { get; set; } = "https://tracker-api.beartoolkit.com/public/"; + public string BearApiBaseUrl { get; set; } = "https://tracker.beartoolkit.com/api/"; public string BearApiTrainPath { get; set; } = "hunttrain"; public TimeSpan BearApiTimeout { get; set; } = TimeSpan.FromSeconds(5); public string BearSiteTrainUrl { get; set; } = "https://tracker.beartoolkit.com/train"; diff --git a/ScoutHelper/Managers/BearManager.cs b/ScoutHelper/Managers/BearManager.cs index fe2e80f..68fb8d8 100644 --- a/ScoutHelper/Managers/BearManager.cs +++ b/ScoutHelper/Managers/BearManager.cs @@ -18,6 +18,12 @@ namespace ScoutHelper.Managers; public class BearManager : IDisposable { private readonly IPluginLog _log; private readonly Configuration _conf; + + private static readonly JsonSerializerSettings JsonSerializerSettings = new JsonSerializerSettings() { + DateFormatString = "yyyy'-'MM'-'dd'T'HH':'mm':'ssK", + DateTimeZoneHandling = DateTimeZoneHandling.Utc + }; + private static HttpClient HttpClient { get; } = new(); private IDictionary MobIdToBearName { get; init; } @@ -54,9 +60,10 @@ IEnumerable trainMobs .Max(); var requestPayload = JsonConvert.SerializeObject( - new BearApiTrainRequest(worldName, _conf.BearTrainName, highestPatch.BearName(), spawnPoints) + new BearApiTrainRequest(worldName, _conf.BearTrainName, highestPatch.BearName(), spawnPoints), + JsonSerializerSettings ); - _log.Debug("Request payload: {0}", requestPayload); + _log.Debug("Request payload: {0:l}", requestPayload); var requestContent = new StringContent(requestPayload, Encoding.UTF8, Constants.MediaTypeJson); try {