Move from an ignore handler to hacking the IRC adapter

lysenko.go

@@ -8,11 +8,11 @@ import (
 	"time"
 
 	"github.com/tcolgate/hugot"
-	"github.com/tcolgate/hugot/adapters/irc"
+
 	irce "github.com/thoj/go-ircevent"
 	"golang.org/x/net/context"
 
-	"ur.gs/lysenko/handlers/ignore"
+	"ur.gs/lysenko/adapters/irc"
 	"ur.gs/lysenko/handlers/quotedb"
 )
 
@@ -32,13 +32,6 @@ func init() {
 	rand.Seed(time.Now().Unix())
 }
 
-func buildAdder(mux *hugot.Mux, ignoreList []string) func(next hugot.HearsHandler) {
-	return func(next hugot.HearsHandler) {
-		mux.AddHearsHandler(ignore.NewHears(ignoreList, next))
-	}
-
-}
-
 func main() {
 	flag.Parse()
 	ignoreList := strings.Split(*ignores, ",")
@@ -55,30 +48,29 @@ func main() {
 	}
 	defer conn.Quit()
 
+	adapter, err := irc.New(conn, ignoreList...)
+	if err != nil {
+		log.Fatal(err)
+	}
+
 	for _, channel := range channelList {
 		conn.Join(channel)
 	}
 
 	ctx := context.Background()
-	adapter, err := irc.New(conn)
-	if err != nil {
-		log.Fatal(err)
-	}
-
 	db, err := quotedb.New(*quotes)
 	if err != nil {
 		log.Fatal(err)
 	}
 	defer db.DB.Close()
 
-	add := buildAdder(hugot.DefaultMux, ignoreList)
-	add(&quotedb.AddQuoteHandler{QuoteDB: db})
-	add(&quotedb.LastQuoteHandler{QuoteDB: db})
-	add(&quotedb.FindQuoteHandler{QuoteDB: db})
-	add(&quotedb.RandQuoteHandler{QuoteDB: db})
-	add(&quotedb.QuoteHandler{QuoteDB: db})
-
-	go hugot.ListenAndServe(ctx, adapter, hugot.DefaultMux)
+	mux := hugot.DefaultMux
+	mux.AddHearsHandler(&quotedb.AddQuoteHandler{QuoteDB: db})
+	mux.AddHearsHandler(&quotedb.LastQuoteHandler{QuoteDB: db})
+	mux.AddHearsHandler(&quotedb.FindQuoteHandler{QuoteDB: db})
+	mux.AddHearsHandler(&quotedb.RandQuoteHandler{QuoteDB: db})
+	mux.AddHearsHandler(&quotedb.QuoteHandler{QuoteDB: db})
 
+	go hugot.ListenAndServe(ctx, adapter, mux)
 	conn.Loop()
 }