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 <[email protected]>
dit-zy · Aug 9, 2024 · c0ce836 · c0ce836
1 parent 426281f
commit c0ce836
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git 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
@@ -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<uint, (Patch patch, string name)> MobIdToBearName { get; init; }
@@ -54,9 +60,10 @@ IEnumerable<TrainMob> 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 {