Merge branch 'sp-tarkov:main' into main

Core/Models/Eft/Profile/SptProfile.cs

@@ -547,4 +547,16 @@ public class Insurance
 
     [JsonPropertyName("items")]
     public List<Item> Items { get; set; }
+}
+
+public class MessageContentRagfair
+{
+    [JsonPropertyName("offerId")]
+    public string OfferId { get; set; }
+
+    [JsonPropertyName("count")]
+    public int Count { get; set; }
+
+    [JsonPropertyName("handbookId")]
+    public string HandbookId { get; set; }
 }

Core/Models/Spt/Dialog/SendMessageDetails.cs

@@ -29,13 +29,13 @@ public class SendMessageDetails
     /// Optional - if sender is USER these details are used
     /// </summary>
     [JsonPropertyName("senderDetails")]
-    public IUserDialogInfo? SenderDetails { get; set; }
+    public UserDialogInfo? SenderDetails { get; set; }
 
     /// <summary>
     /// Optional - the trader sending the message
     /// </summary>
     [JsonPropertyName("trader")]
-    public Traders? Trader { get; set; }
+    public string? Trader { get; set; }
 
     /// <summary>
     /// Optional - used in player/system messages, otherwise templateId is used

Core/Models/Spt/Mod/ModLoader.cs

@@ -1,16 +0,0 @@
-namespace Core.Models.Spt.Mod;
-
-public class ModLoader
-{
-    public void Load(DependencyContainer container)
-    {
-        throw new NotImplementedException();
-    }
-
-    public string GetModPath(string mod)
-    {
-        throw new NotImplementedException();
-    }
-}
-
-// TODO: This needs to be reworked with however we do it for this project

Core/Servers/Http/IHttpListener.cs

@@ -3,5 +3,5 @@
 public interface IHttpListener
 {
     bool CanHandle(string sessionId, object req);
-    Task handle(string sessionId, object req, object resp);
+    Task Handle(string sessionId, object req, object resp);
 }