cleaning up issues with cleanup mail

Author: Denifia

SendItems/Models/MailCreateModel.cs

@@ -2,7 +2,8 @@
 
 namespace Denifia.Stardew.SendItems.Models
 {
-    public class MailCreateModel
+    // Zoolander :)
+    public class CreateMailModel
     {
         public string ToFarmerId { get; set; }
         public string FromFarmerId { get; set; }

SendItems/Services/MailCleanupService.cs

@@ -64,7 +64,7 @@ private void UnreadFutureReadMail()
             );
             if (!localMail.Any()) return;
             var currentGameDateTime = ModHelper.GetGameDayTime();
-            var futureMail = localMail.Where(x => x.ReadInGameDate > currentGameDateTime).ToList();
+            var futureMail = localMail.Where(x => x.ReadInGameDate == null || x.ReadInGameDate > currentGameDateTime).ToList();
             foreach (var mail in futureMail)
             {
                 mail.Status = MailStatus.Delivered;

SendItems/Services/MailDeliveryService.cs

@@ -109,7 +109,7 @@ private async Task DeliverLocalMailToCloud()
             {
                 if (!localFarmers.Any(x => x.Id == mail.ToFarmerId))
                 {
-                    var mailCreateModel = new MailCreateModel
+                    var createMailModel = new CreateMailModel
                     {
                         ToFarmerId = mail.ToFarmerId,
                         FromFarmerId = mail.FromFarmerId,
@@ -119,6 +119,7 @@ private async Task DeliverLocalMailToCloud()
 
                     var urlSegments = new Dictionary<string, string> { { "mailId", mail.Id.ToString() } };
                     var request = ModHelper.FormStandardRequest("mail/{mailId}", urlSegments, Method.PUT);
+                    request.AddJsonBody(createMailModel);
                     var response = await _restClient.ExecuteTaskAsync<bool>(request);
 
                     if (response.Data)
@@ -128,6 +129,8 @@ private async Task DeliverLocalMailToCloud()
                     }
                 }
             }
+
+            Repository.Instance.Upsert(updatedLocalMail.AsEnumerable());
         }
 
         private async Task DeliverCloudMailLocally()

SendItemsApi/Models/CreateMailModel.cs

@@ -2,6 +2,7 @@
 
 namespace Denifia.Stardew.SendItemsApi.Models
 {
+    // Zoolander :)
     public class CreateMailModel
     {
         public string ToFarmerId { get; set; }