From 626f91c4832c097b7036d5063b2f0491397a9c70 Mon Sep 17 00:00:00 2001
From: Reto Brunner <reto@labrat.space>
Date: Wed, 12 Jun 2019 08:31:51 +0200
Subject: imap: respect the folder config option

---
 worker/imap/list.go   | 13 +++++++++++++
 worker/imap/worker.go |  4 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'worker')

diff --git a/worker/imap/list.go b/worker/imap/list.go
index 5e282ef7..552fb457 100644
--- a/worker/imap/list.go
+++ b/worker/imap/list.go
@@ -17,6 +17,19 @@ func (imapw *IMAPWorker) handleListDirectories(msg *types.ListDirectories) {
 				// no need to pass this to handlers if it can't be opened
 				continue
 			}
+			if len(imapw.config.folders) > 0 {
+				// apply user filter
+				found := false
+				for _, folder := range imapw.config.folders {
+					if folder == mbox.Name || imapw.selected.Name == mbox.Name {
+						found = true
+						break
+					}
+				}
+				if !found {
+					continue
+				}
+			}
 			imapw.worker.PostMessage(&types.Directory{
 				Message:    types.RespondTo(msg),
 				Name:       mbox.Name,
diff --git a/worker/imap/worker.go b/worker/imap/worker.go
index d978755e..aa59c27d 100644
--- a/worker/imap/worker.go
+++ b/worker/imap/worker.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/emersion/go-imap"
-	"github.com/emersion/go-imap-idle"
+	idle "github.com/emersion/go-imap-idle"
 	"github.com/emersion/go-imap/client"
 
 	"git.sr.ht/~sircmpwn/aerc/worker/types"
@@ -26,6 +26,7 @@ type IMAPWorker struct {
 		insecure bool
 		addr     string
 		user     *url.Userinfo
+		folders  []string
 	}
 
 	client   *imapClient
@@ -75,6 +76,7 @@ func (w *IMAPWorker) handleMessage(msg types.WorkerMessage) error {
 		}
 
 		w.config.user = u.User
+		w.config.folders = msg.Config.Folders
 	case *types.Connect:
 		var (
 			c   *client.Client
-- 
cgit