added config option + readme

Virtomize · Jan 20, 2020 · 893f5ff · 893f5ff
1 parent 969b3e1
commit 893f5ff
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -23,6 +23,7 @@ Filter emails from mail accounts and send them to mattermost.
 - Choose to post Subject and Body or Subject only
 - Send to channels and/or users
 - Profile management including default profiles
+- Mail attachment support
 
 Missing feature or found a bug ? Feel free to open an [issue](https://github.com/cseeger-epages/mail2most/issues) and let us know !
 

diff --git a/conf/mail2most.conf b/conf/mail2most.conf
@@ -55,6 +55,8 @@
     StripHTML = true
     # HideFrom allows you to hide the From Address in mattermost messages
     HideFrom= false
+    # allow posting mail attachments into mattermost
+    MailAttachments = true
 
   # The DefaultProfile.Filter defines a default filter
   # if your Profile has no defined filter this information will be used
@@ -108,6 +110,8 @@
   StripHTML = true
   # HideFrom allows you to hide the From Address in mattermost messages
   HideFrom= false
+  # allow posting mail attachments into mattermost
+  MailAttachments = true
 
   #[Profile.Filter] contains all filters that are applied to your mails and overwrites the default
   [Profile.Filter]

diff --git a/lib/config.go b/lib/config.go
@@ -51,6 +51,7 @@ type mattermost struct {
 	SubjectOnly                                bool
 	StripHTML                                  bool
 	HideFrom                                   bool
+	MailAttachments                            bool
 }
 
 func parseConfig(fileName string, conf *config) error {

diff --git a/lib/mattermost.go b/lib/mattermost.go
@@ -109,15 +109,17 @@ func (m Mail2Most) PostMattermost(profile int, mail Mail) error {
 		}
 
 		var fileIDs []string
-		for _, a := range mail.Attachments {
-			fileResp, resp := c.UploadFile(a.Content, ch.Id, a.Filename)
-			if resp.Error != nil {
-				m.Error("Mattermost Upload File Error", map[string]interface{}{"error": resp.Error})
-			} else {
-				if len(fileResp.FileInfos) != 1 {
-					m.Error("Mattermost Upload File Error", map[string]interface{}{"error": resp.Error, "fileinfos": fileResp.FileInfos})
+		if m.Config.Profiles[profile].Mattermost.MailAttachments {
+			for _, a := range mail.Attachments {
+				fileResp, resp := c.UploadFile(a.Content, ch.Id, a.Filename)
+				if resp.Error != nil {
+					m.Error("Mattermost Upload File Error", map[string]interface{}{"error": resp.Error})
 				} else {
-					fileIDs = append(fileIDs, fileResp.FileInfos[0].Id)
+					if len(fileResp.FileInfos) != 1 {
+						m.Error("Mattermost Upload File Error", map[string]interface{}{"error": resp.Error, "fileinfos": fileResp.FileInfos})
+					} else {
+						fileIDs = append(fileIDs, fileResp.FileInfos[0].Id)
+					}
 				}
 			}
 		}
@@ -183,15 +185,17 @@ func (m Mail2Most) PostMattermost(profile int, mail Mail) error {
 			}
 
 			var fileIDs []string
-			for _, a := range mail.Attachments {
-				fileResp, resp := c.UploadFile(a.Content, ch.Id, a.Filename)
-				if resp.Error != nil {
-					m.Error("Mattermost Upload File Error", map[string]interface{}{"error": resp.Error})
-				} else {
-					if len(fileResp.FileInfos) != 1 {
-						m.Error("Mattermost Upload File Error", map[string]interface{}{"error": resp.Error, "fileinfos": fileResp.FileInfos})
+			if m.Config.Profiles[profile].Mattermost.MailAttachments {
+				for _, a := range mail.Attachments {
+					fileResp, resp := c.UploadFile(a.Content, ch.Id, a.Filename)
+					if resp.Error != nil {
+						m.Error("Mattermost Upload File Error", map[string]interface{}{"error": resp.Error})
 					} else {
-						fileIDs = append(fileIDs, fileResp.FileInfos[0].Id)
+						if len(fileResp.FileInfos) != 1 {
+							m.Error("Mattermost Upload File Error", map[string]interface{}{"error": resp.Error, "fileinfos": fileResp.FileInfos})
+						} else {
+							fileIDs = append(fileIDs, fileResp.FileInfos[0].Id)
+						}
 					}
 				}
 			}