From dcec73af02f39d90bfb3a2dae92b8527fef8d3af Mon Sep 17 00:00:00 2001
From: CWX <cwxdev@outlook.com>
Date: Sat, 18 Jan 2025 13:11:20 +0000
Subject: [PATCH] use prim ctor and fixed warnings: InRaid and Insurance
 callbacks

---
 Core/Callbacks/InraidCallbacks.cs    | 19 +++-----------
 Core/Callbacks/InsuranceCallbacks.cs | 38 ++++++++--------------------
 2 files changed, 15 insertions(+), 42 deletions(-)

diff --git a/Core/Callbacks/InraidCallbacks.cs b/Core/Callbacks/InraidCallbacks.cs
index 4b6b100f..2a065030 100644
--- a/Core/Callbacks/InraidCallbacks.cs
+++ b/Core/Callbacks/InraidCallbacks.cs
@@ -1,28 +1,17 @@
 using Core.Annotations;
 using Core.Controllers;
 using Core.Models.Eft.Common;
-using Core.Models.Eft.HttpResponse;
 using Core.Models.Eft.InRaid;
 using Core.Utils;
 
 namespace Core.Callbacks;
 
 [Injectable]
-public class InraidCallbacks
-{
-    protected InRaidController _inRaidController;
-    protected HttpResponseUtil _httpResponseUtil;
-
-    public InraidCallbacks
-    (
-        InRaidController inRaidController,
-        HttpResponseUtil httpResponseUtil
+public class InraidCallbacks(
+    InRaidController _inRaidController,
+    HttpResponseUtil _httpResponseUtil
     )
-    {
-        _inRaidController = inRaidController;
-        _httpResponseUtil = httpResponseUtil;
-    }
-
+{
     /// <summary>
     /// Handle client/location/getLocalloot
     /// Store active map in profile + applicationContext
diff --git a/Core/Callbacks/InsuranceCallbacks.cs b/Core/Callbacks/InsuranceCallbacks.cs
index e3a724df..195660f8 100644
--- a/Core/Callbacks/InsuranceCallbacks.cs
+++ b/Core/Callbacks/InsuranceCallbacks.cs
@@ -2,10 +2,8 @@
 using Core.Controllers;
 using Core.DI;
 using Core.Models.Eft.Common;
-using Core.Models.Eft.HttpResponse;
 using Core.Models.Eft.Insurance;
 using Core.Models.Eft.ItemEvent;
-using Core.Models.Enums;
 using Core.Models.Spt.Config;
 using Core.Servers;
 using Core.Services;
@@ -15,29 +13,15 @@ namespace Core.Callbacks;
 
 [Injectable(InjectableTypeOverride = typeof(OnUpdate), TypePriority = OnUpdateOrder.InsuranceCallbacks)]
 [Injectable(InjectableTypeOverride = typeof(InsuranceCallbacks))]
-public class InsuranceCallbacks : OnUpdate
-{
-    protected InsuranceController _insuranceController;
-    protected InsuranceService _insuranceService;
-    protected HttpResponseUtil _httpResponseUtil;
-    protected ConfigServer _configServer;
-
-    private InsuranceConfig _insuranceConfig;
-
-    public InsuranceCallbacks
-    (
-        InsuranceController insuranceController,
-        InsuranceService insuranceService,
-        HttpResponseUtil httpResponseUtil,
-        ConfigServer configServer
+public class InsuranceCallbacks(
+    InsuranceController _insuranceController,
+    InsuranceService _insuranceService,
+    HttpResponseUtil _httpResponseUtil,
+    ConfigServer _configServer
     )
-    {
-        _insuranceController = insuranceController;
-        _insuranceService = insuranceService;
-        _httpResponseUtil = httpResponseUtil;
-        _configServer = configServer;
-        _insuranceConfig = configServer.GetConfig<InsuranceConfig>();
-    }
+    : OnUpdate
+{
+    private InsuranceConfig _insuranceConfig = _configServer.GetConfig<InsuranceConfig>();
 
     /// <summary>
     /// Handle client/insurance/items/list/cost
@@ -65,16 +49,16 @@ public class InsuranceCallbacks : OnUpdate
         throw new NotImplementedException();
     }
 
-    public async Task<bool> OnUpdate(long timeSinceLastRun)
+    public Task<bool> OnUpdate(long timeSinceLastRun)
     {
         if (timeSinceLastRun > Math.Max(_insuranceConfig.RunIntervalSeconds, 1))
         {
             // _insuranceController.ProcessReturn();
             // TODO: InsuranceController is not implemented rn
-            return true;
+            return Task.FromResult(true);
         }
 
-        return false;
+        return Task.FromResult(false);
     }
 
     public string GetRoute()