From 2dc436555d8bfa6f2409173d87cd0fec2b2385cf Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Mon, 20 May 2019 19:20:20 -0400
Subject: Load IMAP worker for imap+insecure

---
 worker/imap/worker.go | 3 +--
 worker/worker.go      | 8 +++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'worker')

diff --git a/worker/imap/worker.go b/worker/imap/worker.go
index ade539a..125fba8 100644
--- a/worker/imap/worker.go
+++ b/worker/imap/worker.go
@@ -71,10 +71,9 @@ func (w *IMAPWorker) handleMessage(msg types.WorkerMessage) error {
 
 		w.config.addr = u.Host
 		if !strings.ContainsRune(w.config.addr, ':') {
-			w.config.addr += ":" + u.Scheme
+			w.config.addr += ":" + w.config.scheme
 		}
 
-		w.config.scheme = u.Scheme
 		w.config.user = u.User
 	case *types.Connect:
 		var (
diff --git a/worker/worker.go b/worker/worker.go
index 2a43083..7db7be5 100644
--- a/worker/worker.go
+++ b/worker/worker.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"log"
 	"net/url"
+	"strings"
 )
 
 // Guesses the appropriate worker type based on the given source string
@@ -16,7 +17,12 @@ func NewWorker(source string, logger *log.Logger) (*types.Worker, error) {
 		return nil, err
 	}
 	worker := types.NewWorker(logger)
-	switch u.Scheme {
+	scheme := u.Scheme
+	if strings.ContainsRune(scheme, '+') {
+		scheme = scheme[:strings.IndexRune(scheme, '+')]
+		fmt.Println(scheme)
+	}
+	switch scheme {
 	case "imap":
 		fallthrough
 	case "imaps":
-- 
cgit v1.2.3