From 180d66c09200f664054b387eeb725b8b7c7f1963 Mon Sep 17 00:00:00 2001
From: Chomp <dev@dev.sp-tarkov.com>
Date: Sun, 23 Feb 2025 15:08:47 +0000
Subject: [PATCH] Renamed `RemoveOffer` function to better explain what its
 doing + cleanup

---
 Libraries/Core/Callbacks/RagfairCallbacks.cs  |  2 +-
 .../Core/Controllers/RagfairController.cs     | 23 +++++++++++++------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Libraries/Core/Callbacks/RagfairCallbacks.cs b/Libraries/Core/Callbacks/RagfairCallbacks.cs
index 8d81cb02..ff6cd74c 100644
--- a/Libraries/Core/Callbacks/RagfairCallbacks.cs
+++ b/Libraries/Core/Callbacks/RagfairCallbacks.cs
@@ -102,7 +102,7 @@ public class RagfairCallbacks(
     /// <returns></returns>
     public ItemEventRouterResponse RemoveOffer(PmcData pmcData, RemoveOfferRequestData info, string sessionID)
     {
-        return _ragfairController.RemoveOffer(info, sessionID);
+        return _ragfairController.FlagOfferForRemoval(info.OfferId, sessionID);
     }
 
     /// <summary>
diff --git a/Libraries/Core/Controllers/RagfairController.cs b/Libraries/Core/Controllers/RagfairController.cs
index 2c250f33..755b3c0f 100644
--- a/Libraries/Core/Controllers/RagfairController.cs
+++ b/Libraries/Core/Controllers/RagfairController.cs
@@ -1028,7 +1028,14 @@ public class RagfairController
         };
     }
 
-    public ItemEventRouterResponse RemoveOffer(RemoveOfferRequestData removeRequest, string sessionId)
+    /// <summary>
+    /// Flag an offer as being ready for removal - sets expiry for very near future
+    /// Will be picked up by update() once expiry time has passed
+    /// </summary>
+    /// <param name="offerId">Id of offer to remove</param>
+    /// <param name="sessionId">Session id of requesting player</param>
+    /// <returns></returns>
+    public ItemEventRouterResponse FlagOfferForRemoval(string offerId, string sessionId)
     {
         var output = _eventOutputHolder.GetOutput(sessionId);
 
@@ -1042,7 +1049,7 @@ public class RagfairController
                     new
                     {
                         profileId = sessionId,
-                        offerId = removeRequest.OfferId
+                        offerId = offerId
                     }
                 )
             );
@@ -1050,30 +1057,32 @@ public class RagfairController
             pmcData.RagfairInfo.Offers = [];
         }
 
-        var playerOfferIndex = playerProfileOffers.FindIndex(offer => offer.Id == removeRequest.OfferId);
-        if (playerOfferIndex == -1)
+        var playerOffer = playerProfileOffers?.FirstOrDefault(x => x.Id == offerId);
+        if (playerOffer is null)
         {
             _logger.Error(
                 _localisationService.GetText(
                     "ragfair-offer_not_found_in_profile",
                     new
                     {
-                        offerId = removeRequest.OfferId
+                        offerId = offerId
                     }
                 )
             );
+
             return _httpResponseUtil.AppendErrorToOutput(
                 output,
                 _localisationService.GetText("ragfair-offer_not_found_in_profile_short")
             );
         }
 
-        var differenceInSeconds = playerProfileOffers[playerOfferIndex].EndTime - _timeUtil.GetTimeStamp();
+        // Only reduce time to end if time remaining is greater than what we would set it to
+        var differenceInSeconds = playerOffer.EndTime - _timeUtil.GetTimeStamp();
         if (differenceInSeconds > _ragfairConfig.Sell.ExpireSeconds)
         {
             // `expireSeconds` Default is 71 seconds
             var newEndTime = _ragfairConfig.Sell.ExpireSeconds + _timeUtil.GetTimeStamp();
-            playerProfileOffers[playerOfferIndex].EndTime = (long?) Math.Round((double) newEndTime);
+            playerOffer.EndTime = (long?) Math.Round((double) newEndTime);
         }
 
         return output;