Merge pull request #65 from Virtomize/issue/64

issue #64 config option to allow/deny processing of empty messages

Author: c-seeger

conf/mail2most.conf

@@ -68,6 +68,8 @@
     SubjectOnly = false
     # BodyOnly will post only the mail body
     BodyOnly = false
+    # SkipEmptyMessages - only post messages with non empty email bodys
+    SkipEmptyMessages = false
     # StripHTML will remove all HTML tags bevor sending a msg to mattermost
     StripHTML = true
     # ConvertToMarkdown will convert html mails to markdown for better readability in mattermost

lib/config.go

@@ -56,6 +56,7 @@ type mattermost struct {
 	Broadcast                                  []string
 	SubjectOnly                                bool
 	BodyOnly                                   bool
+	SkipEmptyMessages                          bool
 	StripHTML                                  bool
 	ConvertToMarkdown                          bool
 	HideFrom                                   bool

lib/imap.go

@@ -176,14 +176,6 @@ func (m Mail2Most) GetMail(profile int) ([]Mail, error) {
 				return []Mail{}, err
 			}
 
-			// Skip empty messages.
-			if len(strings.TrimSpace(body)) < 1 && len(attachments) < 1 {
-				m.Info("blank message", map[string]interface{}{
-					"subject": msg.Envelope.Subject, "uid": msg.Uid,
-				})
-				continue
-			}
-
 			// Skip mailserver error notifications.
 			if strings.HasPrefix(msg.Envelope.Subject, "Delivery Status Notification") {
 				if m.Config.Profiles[profile].Filter.IgnoreMailErrorNotifications {

lib/mattermost.go

@@ -87,8 +87,10 @@ func (m Mail2Most) PostMattermost(profile int, mail Mail) error {
 	}
 
 	if len(strings.TrimSpace(body)) < 1 {
-		m.Info("dead body found", map[string]interface{}{"function": "Mail2Most.PostMattermost"})
-		return nil
+		if m.Config.Profiles[profile].Mattermost.SkipEmptyMessages {
+			m.Info("empty message body found", map[string]interface{}{"function": "Mail2Most.PostMattermost"})
+			return nil
+		}
 	}
 
 	if m.Config.Profiles[profile].Mattermost.BodyPrefix != "" {