diff options
| author | Robin Jarry <robin@jarry.cc> | 2021-11-01 21:19:17 +0100 |
|---|---|---|
| committer | Robin Jarry <robin@jarry.cc> | 2021-11-02 11:24:33 +0100 |
| commit | 4cf0ea2a056708274438189e6eb3a0c805bf4ae1 (patch) | |
| tree | 04279eb92d4eb8514cbb06ef35ef417b00657cd3 /worker/imap | |
| parent | 138977b2ceef2af605f48a5ea9e44c967947561b (diff) | |
| download | aerc-4cf0ea2a056708274438189e6eb3a0c805bf4ae1.zip | |
imap: use builtin idle support
go-imap supports IDLE since 1.2.0. Remove dependency to go-imap-idle.
Link: https://github.com/emersion/go-imap/commit/ac3f8e195ef1b6d
Signed-off-by: Robin Jarry <robin@jarry.cc>
Diffstat (limited to 'worker/imap')
| -rw-r--r-- | worker/imap/open.go | 3 | ||||
| -rw-r--r-- | worker/imap/worker.go | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/worker/imap/open.go b/worker/imap/open.go index 891b8a2..0a0d9fe 100644 --- a/worker/imap/open.go +++ b/worker/imap/open.go @@ -18,9 +18,6 @@ func (imapw *IMAPWorker) handleOpenDirectory(msg *types.OpenDirectory) { }, nil) } else { imapw.worker.PostMessage(&types.Done{types.RespondTo(msg)}, nil) - if imapw.idleStop == nil { - imapw.idleStop = make(chan struct{}) - } } } diff --git a/worker/imap/worker.go b/worker/imap/worker.go index dab0afb..7e00966 100644 --- a/worker/imap/worker.go +++ b/worker/imap/worker.go @@ -7,7 +7,6 @@ import ( "strings" "github.com/emersion/go-imap" - idle "github.com/emersion/go-imap-idle" sortthread "github.com/emersion/go-imap-sortthread" "github.com/emersion/go-imap/client" "golang.org/x/oauth2" @@ -27,7 +26,6 @@ var errUnsupported = fmt.Errorf("unsupported command") type imapClient struct { *client.Client - idle *idle.IdleClient sort *sortthread.SortClient } @@ -157,7 +155,7 @@ func (w *IMAPWorker) handleMessage(msg types.WorkerMessage) error { } c.Updates = w.updates - w.client = &imapClient{c, idle.NewClient(c), sortthread.NewSortClient(c)} + w.client = &imapClient{c, sortthread.NewSortClient(c)} w.worker.PostMessage(&types.Done{types.RespondTo(msg)}, nil) case *types.ListDirectories: w.handleListDirectories(msg) @@ -194,7 +192,7 @@ func (w *IMAPWorker) handleMessage(msg types.WorkerMessage) error { if w.idleStop != nil { w.idleStop = make(chan struct{}) go func() { - w.idleDone <- w.client.idle.IdleWithFallback(w.idleStop, 0) + w.idleDone <- w.client.Idle(w.idleStop, &client.IdleOptions{0, 0}) }() } return reterr |