switch to rendering newsletter for each contact

ServiceStack · Jun 26, 2023 · 00746fd · 00746fd
1 parent 80f3043
commit 00746fd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/CreatorKit.Extensions/CustomEmailRunServices.cs b/CreatorKit.Extensions/CustomEmailRunServices.cs
@@ -15,8 +15,6 @@ public async Task<object> Any(NewsletterMailRun request)
     {
         var newsletterDate = request.ToDate ?? DateTime.UtcNow;
         var response = Renderer.CreateMailRunResponse();
-        var viewRequest = request.ConvertTo<RenderNewsletter>();
-        var bodyHtml = (string) await Gateway.SendAsync(typeof(string), viewRequest);
 
         var mailRun = await Renderer.CreateMailRunAsync(Db, new MailRun {
             Layout = "marketing",
@@ -25,13 +23,15 @@ public async Task<object> Any(NewsletterMailRun request)
 
         foreach (var sub in await Db.GetActiveSubscribersAsync(request.MailingList))
         {
+            var viewRequest = request.ConvertTo<RenderNewsletter>().FromContact(sub);
+            var bodyHtml = (string) await Gateway.SendAsync(typeof(string), viewRequest);
             response.AddMessage(await Renderer.CreateMessageRunAsync(Db, new MailMessageRun
             {
                 Message = new EmailMessage
                 {
                     To = sub.ToMailTos(),
                     Subject = string.Format(AppData.Info.NewsletterFmt, $"{newsletterDate:MMMM} {newsletterDate:yyyy}"),
-                    BodyHtml = Renderer.ReplaceContactArgs(bodyHtml, sub),
+                    BodyHtml = bodyHtml,
                 }
             }.FromRequest(viewRequest), mailRun, sub));
         }

diff --git a/CreatorKit.Extensions/CustomRendererServices.cs b/CreatorKit.Extensions/CustomRendererServices.cs
@@ -42,8 +42,8 @@ public async Task<object> Any(RenderNewsletter request)
 
         return await Renderer.RenderToHtmlResultAsync(Db, context, request, args: new() {
             ["title"] = $"{toDate:MMMM} {toDate:yyyy}",
-            ["header"] = request.Header != null ? await context.RenderScriptAsync(request.Header, Renderer.PassContactArgs) : null,
-            ["footer"] = request.Footer != null ? await context.RenderScriptAsync(request.Footer, Renderer.PassContactArgs) : null,
+            ["header"] = request.Header != null ? await context.RenderScriptAsync(request.Header, request.ToObjectDictionary()) : null,
+            ["footer"] = request.Footer != null ? await context.RenderScriptAsync(request.Footer, request.ToObjectDictionary()) : null,
         });
     }
 }