parra/ntfy
parra/ntfy
1
0
Fork 0
mirror of https://github.com/binwiederhier/ntfy.git synced 2025-05-23 23:37:45 +02:00
Code Releases Activity

Flip title and message if message is empty

Browse source
This commit is contained in:
Philipp Heckel 2021-12-28 01:41:00 +01:00
parent 113053a9e3
commit 04719f8dee
2 changed files with 38 additions and 1 deletions

7
server/smtp_server.go
View file

@ -110,11 +110,12 @@ func (s *smtpSession) Data(r io.Reader) error {
if err != nil {
return err
}
body = strings.TrimSpace(body)
if len(body) > conf.MessageLimit {
body = body[:conf.MessageLimit]
}
m := newDefaultMessage(s.topic, body)
subject := msg.Header.Get("Subject")
subject := strings.TrimSpace(msg.Header.Get("Subject"))
if subject != "" {
dec := mime.WordDecoder{}
subject, err := dec.DecodeHeader(subject)
@ -123,6 +124,10 @@ func (s *smtpSession) Data(r io.Reader) error {
}
m.Title = subject
}
if m.Title != "" && m.Message == "" {
m.Message = m.Title // Flip them, this makes more sense
m.Title = ""
}
if err := s.backend.sub(m); err != nil {
return err
}