vbatts/ntfy
1
0
Fork 0
Code Pull requests Activity

Fix comments

Browse source
This commit is contained in:
binwiederhier 2023-02-20 15:48:34 -05:00
parent 224eae2d2d
commit 83d7dd99e8
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
server/smtp_server.go
View file

@ -94,7 +94,7 @@ func (s *smtpSession) Rcpt(to string) error {
if !strings.HasSuffix(to, "@"+conf.SMTPServerDomain) { if !strings.HasSuffix(to, "@"+conf.SMTPServerDomain) {
return errInvalidDomain return errInvalidDomain
} }
// remove @ntfy.sh from end of email // Remove @ntfy.sh from end of email
to = strings.TrimSuffix(to, "@"+conf.SMTPServerDomain) to = strings.TrimSuffix(to, "@"+conf.SMTPServerDomain)
if conf.SMTPServerAddrPrefix != "" { if conf.SMTPServerAddrPrefix != "" {
if !strings.HasPrefix(to, conf.SMTPServerAddrPrefix) { if !strings.HasPrefix(to, conf.SMTPServerAddrPrefix) {
@ -103,7 +103,7 @@ func (s *smtpSession) Rcpt(to string) error {
// remove ntfy- from beginning of email // remove ntfy- from beginning of email
to = strings.TrimPrefix(to, conf.SMTPServerAddrPrefix) to = strings.TrimPrefix(to, conf.SMTPServerAddrPrefix)
} }
// if email contains token, split topic and token // If email contains token, split topic and token
if strings.Contains(to, "+") { if strings.Contains(to, "+") {
parts := strings.Split(to, "+") parts := strings.Split(to, "+")
to = parts[0] to = parts[0]
@ -175,7 +175,6 @@ func (s *smtpSession) publishMessage(m *message) error {
if err != nil { if err != nil {
remoteAddr = s.conn.Conn().RemoteAddr().String() remoteAddr = s.conn.Conn().RemoteAddr().String()
} }
// Call HTTP handler with fake HTTP request // Call HTTP handler with fake HTTP request
url := fmt.Sprintf("%s/%s", s.backend.config.BaseURL, m.Topic) url := fmt.Sprintf("%s/%s", s.backend.config.BaseURL, m.Topic)
req, err := http.NewRequest("POST", url, strings.NewReader(m.Message)) req, err := http.NewRequest("POST", url, strings.NewReader(m.Message))