shen/zenfeed
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misc update

Browse Source
This commit is contained in:
glidea
2025-04-20 09:02:30 +08:00
parent 2f00c43900
commit 9d7ea3c845
4 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/notify/channel/channel.go
View File

@@ -41,7 +41,7 @@ type Config struct {
}
func (c *Config) Validate() error {
if c.Email != nil {
if c.Email.Enabled() {
if err := c.Email.Validate(); err != nil {
return errors.Wrap(err, "validate email")
}
@@ -56,9 +56,6 @@ type Receiver struct {
}
func (r *Receiver) Validate() error {
if r.Email == "" && r.Webhook == nil {
return errors.New("email or webhook is required")
}
if r.Email != "" && r.Webhook != nil {
return errors.New("email and webhook cannot both be set")
}
@@ -97,7 +94,7 @@ func new(instance string, config *Config, dependencies Dependencies) (Channel, e
}
var email sender
if config.Email != nil {
if config.Email.Enabled() {
var err error
email, err = newEmail(config.Email, dependencies)
if err != nil {

4
pkg/notify/channel/email.go
View File

@@ -48,6 +48,10 @@ type Email struct {
feedHTMLSnippetTemplate *template.Template
}
func (c *Email) Enabled() bool {
return c != nil && c.SmtpEndpoint != ""
}
func (c *Email) Validate() error {
if c.SmtpEndpoint == "" {
return errors.New("email.smtp_endpoint is required")