Skip to content

BillionMail gives you open-source MailServer, NewsLetter, Email Marketing — fully self-hosted, dev-friendly, and free from monthly fees. Join the discord: https://discord.gg/asfXzBUhZr

Merge remote-tracking branch 'origin/main'

lotk6b93a34ee354
diff --cc core/internal/service/batch_mail/task_executor.go
index 8f962160,ea1bfe75..1bb456c7
--- a/core/internal/service/batch_mail/task_executor.go
+++ b/core/internal/service/batch_mail/task_executor.go
@@@ -871,30 -881,10 +871,30 @@@ func (e *TaskExecutor) processEmailCont
}
// personalizeEmail personalize email content
-func (e *TaskExecutor) personalizeEmail(ctx context.Context, content string, task *entity.EmailTask, recipient *entity.RecipientInfo) string {
- // process unsubscribe JWT
+func (e *TaskExecutor) personalizeEmail(ctx context.Context, content string, task *entity.EmailTask, recipient *entity.RecipientInfo) (string, string) {
+
+ var contact entity.Contact
+ err := g.DB().Model("bm_contacts").Where("email", recipient.Recipient).Scan(&contact)
+ if err != nil {
+ g.Log().Error(ctx, "get contact info failed: %v", err)
+ }
+
+ var emailtask entity.EmailTask
+ err = g.DB().Model("email_tasks").Where("id", task.Id).Scan(&emailtask)
+ if err != nil {
+ g.Log().Error(ctx, "get task info failed: %v", err)
+ emailtask = *task
+ }
+
+ // Unsubscribe
+ var renderedContent, renderedSubject string
+ engine := GetTemplateEngine()
+
if task.Unsubscribe == 1 {
- domain := domains.GetBaseURL()
- // generate JWT
++ domain := domains.GetBaseURLBySender(task.Addresser)
+ unsubscribeURL := fmt.Sprintf("%s/api/unsubscribe", domain)
+ groupURL := fmt.Sprintf("%s/api/unsubscribe/user_group", domain)
+
jwtToken, err := GenerateUnsubscribeJWT(
recipient.Recipient,
task.TemplateId,
@@@ -972,14 -934,15 +972,14 @@@ func (e *TaskExecutor) sendEmail(ctx co
messageID := sender.GenerateMessageID()
//Tracking emails
- baseURL := domains.GetBaseURL()
+ baseURL := domains.GetBaseURLBySender(task.Addresser)
- mail_tracker := maillog_stat.NewMailTracker(content, task.Id, messageID, recipient.Recipient, baseURL)
+ mail_tracker := maillog_stat.NewMailTracker(renderedContent, task.Id, messageID, recipient.Recipient, baseURL)
mail_tracker.TrackLinks()
mail_tracker.AppendTrackingPixel()
- content = mail_tracker.GetHTML()
-
- // create email message
- message := mail_service.NewMessage(task.Subject, content)
+ renderedContent = mail_tracker.GetHTML()
+ // create email message with rendered subject
+ message := mail_service.NewMessage(renderedSubject, renderedContent)
message.SetMessageID(messageID)
// set sender display name