From 1111e7d518548e765099738b2164d8fe36f119cf Mon Sep 17 00:00:00 2001
From: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
Date: Tue, 14 May 2024 07:29:59 +0000
Subject: [PATCH] Fix 390 modules compilation (!126)

Removes some issues that were added during the 3.8.2 merge
- Remove re-added deprecated 3.8.0 ReqestHandler code
- Remove duplicate `_sptPluginFolder` variable in AkiBotsPrePatcher

Co-authored-by: DrakiaXYZ <565558+TheDgtl@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Modules/pulls/126
Co-authored-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
Co-committed-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
---
 project/Aki.Common/Http/RequestHandler.cs | 84 -----------------------
 project/Aki.PrePatch/AkiBotsPrePatcher.cs |  2 -
 2 files changed, 86 deletions(-)

diff --git a/project/Aki.Common/Http/RequestHandler.cs b/project/Aki.Common/Http/RequestHandler.cs
index 498ecee..0917a5c 100644
--- a/project/Aki.Common/Http/RequestHandler.cs
+++ b/project/Aki.Common/Http/RequestHandler.cs
@@ -129,89 +129,5 @@ namespace Aki.Common.Http
         {
             return Task.Run(() => PutJsonAsync(path, json)).Result;
         }
-
-#region DEPRECATED, REMOVE IN 3.8.1
-        [Obsolete("GetData(path, isHost) is deprecated, please use GetData(path) instead.")]
-        public static byte[] GetData(string path, bool hasHost)
-        {
-            var url = (hasHost) ? path : Host + path;
-            _logger.LogInfo($"Request GET data: {SessionId}:{url}");
-
-            var headers = new Dictionary<string, string>()
-            {
-                { "Cookie", $"PHPSESSID={SessionId}" },
-                { "SessionId", SessionId }
-            };
-
-            var request = new Request();
-            var data = request.Send(url, "GET", null, headers: headers);
-
-            ValidateData(url, data);
-            return data;
-
-        }
-
-        [Obsolete("GetJson(path, isHost) is deprecated, please use GetJson(path) instead.")]
-        public static string GetJson(string path, bool hasHost)
-        {
-            var url = (hasHost) ? path : Host + path;
-            _logger.LogInfo($"Request GET json: {SessionId}:{url}");
-
-            var headers = new Dictionary<string, string>()
-            {
-                { "Cookie", $"PHPSESSID={SessionId}" },
-                { "SessionId", SessionId }
-            };
-
-            var request = new Request();
-            var data = request.Send(url, "GET", headers: headers);
-            var body = Encoding.UTF8.GetString(data);
-
-            ValidateJson(url, body);
-            return body;
-
-        }
-
-        [Obsolete("PostJson(path, json, isHost) is deprecated, please use PostJson(path, json) instead.")]
-        public static string PostJson(string path, string json, bool hasHost)
-        {
-            var url = (hasHost) ? path : Host + path;
-            _logger.LogInfo($"Request POST json: {SessionId}:{url}");
-
-            var payload = Encoding.UTF8.GetBytes(json);
-            var mime = WebConstants.Mime[".json"];
-            var headers = new Dictionary<string, string>()
-            {
-                { "Cookie", $"PHPSESSID={SessionId}" },
-                { "SessionId", SessionId }
-            };
-
-            var request = new Request();
-            var data = request.Send(url, "POST", payload, true, mime, headers);
-            var body = Encoding.UTF8.GetString(data);
-
-            ValidateJson(url, body);
-            return body;
-
-        }
-
-        [Obsolete("PutJson(path, json, isHost) is deprecated, please use PutJson(path, json) instead.")]
-        public static void PutJson(string path, string json, bool hasHost)
-        {
-            var url = (hasHost) ? path : Host + path;
-            _logger.LogInfo($"Request PUT json: {SessionId}:{url}");
-
-            var payload = Encoding.UTF8.GetBytes(json);
-            var mime = WebConstants.Mime[".json"];
-            var headers = new Dictionary<string, string>()
-            {
-                { "Cookie", $"PHPSESSID={SessionId}" },
-                { "SessionId", SessionId }
-            };
-
-            var request = new Request();
-            request.Send(url, "PUT", payload, true, mime, headers);
-        }
-#endregion
     }
 }
diff --git a/project/Aki.PrePatch/AkiBotsPrePatcher.cs b/project/Aki.PrePatch/AkiBotsPrePatcher.cs
index 5834273..21d5a77 100644
--- a/project/Aki.PrePatch/AkiBotsPrePatcher.cs
+++ b/project/Aki.PrePatch/AkiBotsPrePatcher.cs
@@ -16,8 +16,6 @@ namespace Aki.PrePatch
 
         private static string _sptPluginFolder = "plugins/spt";
 
-        private static string _sptPluginFolder = "plugins/spt";
-
         public static void Patch(ref AssemblyDefinition assembly)
         {
             PerformPreValidation();