Merge pull request #655 from tyfon7/develop

Adjust when Dialogue.AttachmentsNew is changed

Libraries/SPTarkov.Server.Core/Controllers/DialogueController.cs

@@ -469,7 +469,6 @@ public class DialogueController(
         foreach (var dialogId in dialogueIds)
         {
             dialogs[dialogId].New = 0;
-            dialogs[dialogId].AttachmentsNew = 0;
         }
     }
 
@@ -491,9 +490,6 @@ public class DialogueController(
             return null;
         }
 
-        // Removes corner 'new messages' tag
-        dialogInfo!.AttachmentsNew = 0;
-
         var activeMessages = GetActiveMessagesFromDialog(sessionId, dialogueId);
         var messagesWithAttachments = GetMessageWithAttachments(activeMessages);
 

Libraries/SPTarkov.Server.Core/Helpers/DialogueHelper.cs

@@ -50,14 +50,13 @@ public class DialogueHelper(ISptLogger<DialogueHelper> logger, ProfileHelper pro
     public List<Item>? GetMessageItemContents(MongoId messageId, MongoId sessionId, MongoId itemId)
     {
         var fullProfile = profileHelper.GetFullProfile(sessionId);
-        var dialogueData = fullProfile.DialogueRecords;
+        if (fullProfile.DialogueRecords is null)
-        if (dialogueData is null)
         {
             logger.Error("DialogueData is null when trying to get message item contents");
             return [];
         }
 
-        foreach (var (dialogId, dialog) in dialogueData)
+        foreach (var (dialogId, dialog) in fullProfile.DialogueRecords)
         {
             var message = dialog.Messages?.FirstOrDefault(x => x.Id == messageId);
             if (message is null)
@@ -65,32 +64,21 @@ public class DialogueHelper(ISptLogger<DialogueHelper> logger, ProfileHelper pro
                 continue;
             }
 
-            if (message.Id != messageId)
-            {
-                continue;
-            }
-
-            if (fullProfile.DialogueRecords is null)
-            {
-                continue;
-            }
-
-            var attachmentsNew = fullProfile.DialogueRecords[dialogId].AttachmentsNew;
-            if (attachmentsNew > 0)
-            {
-                fullProfile.DialogueRecords[dialogId].AttachmentsNew = attachmentsNew - 1;
-            }
-
-            // Check reward count when item being moved isn't in reward list
-            // If count is 0, it means after this move occurs the reward array will be empty and all rewards collected
             message.Items ??= new MessageItems();
             message.Items.Data ??= [];
 
-            var messageItems = message.Items.Data?.Where(x => x.Id != itemId);
+            // Check reward count when item being moved isn't in reward list
-            if (messageItems is null || !messageItems.Any())
+            // If count is 0, it means after this move occurs the reward array will be empty and all rewards collected
+            var remainingItems = message.Items.Data.Where(x => x.Id != itemId);
+            if (!remainingItems.Any())
             {
                 message.RewardCollected = true;
                 message.HasRewards = false;
+
+                if (dialog.AttachmentsNew > 0)
+                {
+                    dialog.AttachmentsNew--;
+                }
             }
 
             return message.Items.Data;