Merge pull request #3 from karashiiro/fix/junk-mail

Receive junk emails

docker-compose.yml

@@ -20,6 +20,7 @@ services:
       OPERATOR_SMTP_SERVER: ${OPERATOR_SMTP_SERVER}
       OPERATOR_IMAP_SERVER: ${OPERATOR_IMAP_SERVER}
       OPERATOR_INBOX: ${OPERATOR_INBOX}
+      OPERATOR_JUNK: ${OPERATOR_JUNK}
       OPERATOR_POSTGRES: postgres
     depends_on:
       - postgres

pkg/inbox/receive-emails.go

@@ -17,20 +17,19 @@ type ReceiveEmailsJob struct {
 }
 
 func (j *ReceiveEmailsJob) Execute() {
-	auth := eazye.MailboxInfo{
-		Host:   os.Getenv("OPERATOR_IMAP_SERVER"),
-		TLS:    true,
-		User:   os.Getenv("OPERATOR_EMAIL"),
-		Pwd:    os.Getenv("OPERATOR_PASSWORD"),
-		Folder: os.Getenv("OPERATOR_INBOX"),
-	}
-
 	log.Println("Fetching unread operator emails")
-	emails, err := eazye.GetUnread(auth, true, false)
+	emails, err := getEmails(os.Getenv("OPERATOR_INBOX"))
 	if err != nil {
 		log.Printf("Failed to get incoming emails: %v\n", err)
 	}
 
+	junkEmails, err := getEmails(os.Getenv("OPERATOR_JUNK"))
+	if err != nil {
+		log.Printf("Failed to get incoming junk emails: %v\n", err)
+	}
+
+	emails = append(emails, junkEmails...)
+
 	newReaders := make([]*ReaderInfo, 0)
 	updatedReaders := make([]*ReaderInfo, 0)
 	unsubscribers := make([]string, 0)
@@ -108,3 +107,20 @@ func (j *ReceiveEmailsJob) Key() int {
 	h.Write([]byte(j.Description()))
 	return int(h.Sum32())
 }
+
+func getEmails(mailbox string) ([]eazye.Email, error) {
+	auth := eazye.MailboxInfo{
+		Host:   os.Getenv("OPERATOR_IMAP_SERVER"),
+		TLS:    true,
+		User:   os.Getenv("OPERATOR_EMAIL"),
+		Pwd:    os.Getenv("OPERATOR_PASSWORD"),
+		Folder: mailbox,
+	}
+
+	emails, err := eazye.GetUnread(auth, true, false)
+	if err != nil {
+		return nil, err
+	}
+
+	return emails, nil
+}

pkg/reports/reports.go

@@ -19,6 +19,8 @@ type ReportJob struct {
 }
 
 func (j *ReportJob) Execute() {
+	log.Println("Checking plugin pull requests and subscribers")
+
 	// Process all open pull requests
 	reportTemplates, err := GetPlogonReportTemplates()
 	if err != nil {