dev day #79

pkg/email/service.go

@@ -585,6 +585,19 @@ func (s *emailService) buildDialerAndFrom() (*mail.Dialer, string, string) {
 		}
 	}
 
+	// Fallback FromName to club name when not configured
+	if strings.TrimSpace(effFromName) == "" && s.db != nil {
+		var set models.Settings
+		if err := s.db.First(&set).Error; err == nil {
+			if name := strings.TrimSpace(set.ClubName); name != "" {
+				effFromName = name
+			}
+		}
+	}
+	if strings.TrimSpace(effFromName) == "" {
+		effFromName = "Fotbal Club"
+	}
+
 	d := mail.NewDialer(effHost, effPort, effUser, effPass)
 	if effEncryption == "ssl" {
 		d.SSL = true
@@ -1202,7 +1215,7 @@ func (s *emailService) SendNewsletter(data *NewsletterData) error {
 
 		m := mail.NewMessage()
 		// Build From with sanitized values; prefer emailData overrides if provided
-		rawName := effFromName + " Newsletter"
+		rawName := effFromName
 		if strings.TrimSpace(emailData.FromName) != "" {
 			rawName = emailData.FromName
 		}