From 44234cf6ad86f9be242fdc939af09924bcf65022 Mon Sep 17 00:00:00 2001
From: CWX <cwxdev@outlook.com>
Date: Sun, 12 Jan 2025 15:31:22 +0000
Subject: [PATCH] callbacks

---
 Core/Callbacks/BotCallbacks.cs           | 2 +-
 Core/Callbacks/BundleCallbacks.cs        | 7 ++++---
 Core/Callbacks/CustomizationCallbacks.cs | 2 +-
 Core/Callbacks/DataCallbacks.cs          | 2 +-
 Core/Callbacks/GameCallbacks.cs          | 3 ++-
 Core/Callbacks/MatchCallbacks.cs         | 4 ++--
 Core/Callbacks/NotifierCallbacks.cs      | 2 +-
 Core/Callbacks/TraderCallbacks.cs        | 1 +
 8 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Core/Callbacks/BotCallbacks.cs b/Core/Callbacks/BotCallbacks.cs
index e6112219..c99a47fd 100644
--- a/Core/Callbacks/BotCallbacks.cs
+++ b/Core/Callbacks/BotCallbacks.cs
@@ -10,7 +10,7 @@ using Core.Utils;
 
 namespace Core.Callbacks;
 
-[Injectable]
+[Injectable(InjectableTypeOverride = typeof(BotCallbacks))]
 public class BotCallbacks
 {
     protected BotController _botController;
diff --git a/Core/Callbacks/BundleCallbacks.cs b/Core/Callbacks/BundleCallbacks.cs
index 10b6c964..bb1ef5e0 100644
--- a/Core/Callbacks/BundleCallbacks.cs
+++ b/Core/Callbacks/BundleCallbacks.cs
@@ -1,4 +1,5 @@
 using Core.Annotations;
+using Core.Models.Eft.Common;
 using Core.Models.Enums;
 using Core.Models.Spt.Config;
 using Core.Servers;
@@ -6,7 +7,7 @@ using Core.Utils;
 
 namespace Core.Callbacks;
 
-[Injectable]
+[Injectable(InjectableTypeOverride = typeof(BundleCallbacks))]
 public class BundleCallbacks
 {
     protected HttpResponseUtil _httpResponseUtil;
@@ -34,10 +35,10 @@ public class BundleCallbacks
     /// <param name="info"></param>
     /// <param name="sessionID"></param>
     /// <returns></returns>
-    public string GetBundles(string url, object info, string sessionID)
+    public string GetBundles(string url, EmptyRequestData info, string sessionID)
     {
         // return _httpResponseUtil.NoBody(_bundleLoader.GetBundles());
-        throw new NotImplementedException();
+        return _httpResponseUtil.NoBody(new List<object>());
     }
 
     public string GetBundle(string url, object info, string sessionID)
diff --git a/Core/Callbacks/CustomizationCallbacks.cs b/Core/Callbacks/CustomizationCallbacks.cs
index 411e77af..251d21bc 100644
--- a/Core/Callbacks/CustomizationCallbacks.cs
+++ b/Core/Callbacks/CustomizationCallbacks.cs
@@ -82,7 +82,7 @@ public class CustomizationCallbacks
     /// <param name="body"></param>
     /// <param name="sessionID"></param>
     /// <returns></returns>
-    public string GetHideoutCustomisation(PmcData pmcData, EmptyRequestData info, string sessionID)
+    public string GetHideoutCustomisation(string url, EmptyRequestData info, string sessionID)
     {
         return _httpResponseUtil.GetBody(_customizationController.GetHideoutCustomisation(sessionID, info));
     }
diff --git a/Core/Callbacks/DataCallbacks.cs b/Core/Callbacks/DataCallbacks.cs
index ecb32aca..d641c0cb 100644
--- a/Core/Callbacks/DataCallbacks.cs
+++ b/Core/Callbacks/DataCallbacks.cs
@@ -12,7 +12,7 @@ using Core.Utils;
 
 namespace Core.Callbacks;
 
-[Injectable]
+[Injectable(InjectableTypeOverride = typeof(DataCallbacks))]
 public class DataCallbacks
 {
     protected HttpResponseUtil _httpResponseUtil;
diff --git a/Core/Callbacks/GameCallbacks.cs b/Core/Callbacks/GameCallbacks.cs
index 2a7aaf3c..c5a5a8e6 100644
--- a/Core/Callbacks/GameCallbacks.cs
+++ b/Core/Callbacks/GameCallbacks.cs
@@ -11,6 +11,7 @@ using Core.Utils;
 namespace Core.Callbacks;
 
 [Injectable(InjectableTypeOverride = typeof(OnLoad), TypePriority = OnLoadOrder.GameCallbacks)]
+[Injectable(InjectableTypeOverride = typeof(GameCallbacks))]
 public class GameCallbacks : OnLoad
 {
     protected HttpResponseUtil _httpResponseUtil;
@@ -214,7 +215,7 @@ public class GameCallbacks : OnLoad
     /// <param name="info"></param>
     /// <param name="sessionID"></param>
     /// <returns></returns>
-    public string GetSurveyView(string url, object info, string sessionID)
+    public string GetSurveyView(string url, SendSurveyOpinionRequest info, string sessionID)
     {
         return _httpResponseUtil.NullResponse();
     }
diff --git a/Core/Callbacks/MatchCallbacks.cs b/Core/Callbacks/MatchCallbacks.cs
index 03c7ebf6..d056aa1f 100644
--- a/Core/Callbacks/MatchCallbacks.cs
+++ b/Core/Callbacks/MatchCallbacks.cs
@@ -38,7 +38,7 @@ public class MatchCallbacks
     /// <param name="info"></param>
     /// <param name="sessionID"></param>
     /// <returns></returns>
-    public string UpdatePing(string url, EmptyRequestData info, string sessionID)
+    public string UpdatePing(string url, UpdatePingRequestData info, string sessionID)
     {
         return _httpResponseUtil.NullResponse();
     }
@@ -230,7 +230,7 @@ public class MatchCallbacks
     /// <param name="info"></param>
     /// <param name="sessionID"></param>
     /// <returns></returns>
-    public string GetMetrics(string url, object info, string sessionID)
+    public string GetMetrics(string url, EmptyRequestData info, string sessionID)
     {
         return _httpResponseUtil.GetBody(_databaseService.GetMatch().Metrics);
     }
diff --git a/Core/Callbacks/NotifierCallbacks.cs b/Core/Callbacks/NotifierCallbacks.cs
index b70ffc3d..907cdd66 100644
--- a/Core/Callbacks/NotifierCallbacks.cs
+++ b/Core/Callbacks/NotifierCallbacks.cs
@@ -9,7 +9,7 @@ using Core.Utils;
 
 namespace Core.Callbacks;
 
-[Injectable]
+[Injectable(InjectableTypeOverride = typeof(NotifierCallbacks))]
 public class NotifierCallbacks
 {
     protected HttpResponseUtil _httpResponseUtil;
diff --git a/Core/Callbacks/TraderCallbacks.cs b/Core/Callbacks/TraderCallbacks.cs
index bedf48e4..11f443db 100644
--- a/Core/Callbacks/TraderCallbacks.cs
+++ b/Core/Callbacks/TraderCallbacks.cs
@@ -13,6 +13,7 @@ namespace Core.Callbacks;
 
 [Injectable(InjectableTypeOverride = typeof(OnLoad), TypePriority = OnLoadOrder.TraderCallbacks)]
 [Injectable(InjectableTypeOverride = typeof(OnUpdate), TypePriority = OnUpdateOrder.TraderCallbacks)]
+[Injectable(InjectableTypeOverride = typeof(TraderCallbacks))]
 public class TraderCallbacks : OnLoad, OnUpdate
 {
     protected HttpResponseUtil _httpResponseUtil;