Merge pull request #44 from cseeger-epages/issue/43

added BodyPrefix/Suffix

conf/mail2most.conf

@@ -73,6 +73,12 @@
     HideFromEmail = false
     # allow posting mail attachments into mattermost
     MailAttachments = true
+    # BodyPrefix adds a prefix to the message body e.g:
+    # BodyPrefix = "**This content was forwarded by Mail2Most and might be reformatted**" 
+    BodyPrefix = ""
+    # BodySuffix adds a suffix to the message body e.g:
+    # BodySuffix = "**Disclaimer: This content was forwarded by Mail2Most and might be reformatted**"
+    BodySuffix = ""
 
   # The DefaultProfile.Filter defines a default filter
   # if your Profile has no defined filter this information will be used
@@ -134,6 +140,12 @@
   HideFromEmail = false
   # allow posting mail attachments into mattermost
   MailAttachments = true
+  # BodyPrefix adds a prefix to the message body e.g:
+  # BodyPrefix = "**This content was forwarded by Mail2Most and might be reformatted**" 
+  BodyPrefix = ""
+  # BodySuffix adds a suffix to the message body e.g:
+  # BodySuffix = "**Disclaimer: This content was forwarded by Mail2Most and might be reformatted**"
+  BodySuffix = ""
 
   #[Profile.Filter] contains all filters that are applied to your mails and overwrites the default
   [Profile.Filter]
@@ -186,6 +198,8 @@
   Broadcast = []
   SubjectOnly = false
   BodyOnly = false
+  BodyPrefix = ""
+  BodySuffix = ""
 
   # if you dont add for example [Profile.Filter] the filters defined in the [DefaultProfile.Filter] section are used
 

lib/config.go

@@ -59,6 +59,7 @@ type mattermost struct {
 	HideFrom                                   bool
 	HideFromEmail                              bool
 	MailAttachments                            bool
+	BodyPrefix, BodySuffix                     string
 }
 
 func parseConfig(fileName string, conf *config) error {

lib/mattermost.go

@@ -63,6 +63,7 @@ func (m Mail2Most) PostMattermost(profile int, mail Mail) error {
 
 	// check if body is base64 encoded
 	var body string
+
 	bb, err := base64.StdEncoding.DecodeString(mail.Body)
 	if err != nil {
 		body = mail.Body
@@ -90,6 +91,14 @@ func (m Mail2Most) PostMattermost(profile int, mail Mail) error {
 		return nil
 	}
 
+	if m.Config.Profiles[profile].Mattermost.BodyPrefix != "" {
+		body = m.Config.Profiles[profile].Mattermost.BodyPrefix + "\n" + body
+	}
+
+	if m.Config.Profiles[profile].Mattermost.BodySuffix != "" {
+		body = body + "\n" + m.Config.Profiles[profile].Mattermost.BodySuffix
+	}
+
 	msg := ":email: "
 
 	if !m.Config.Profiles[profile].Mattermost.HideFrom {