Adjust irc package to changes in config.

2 files changed, 10 insertions, 9 deletions

diff --git a/irc/irc.go b/irc/irc.go
index 27956d4..c3049e7 100644
--- a/irc/irc.go
+++ b/irc/irc.go
@@ -12,7 +12,7 @@ import (
 	"sync"
 	"time"
 
-	cfg "github.com/arachnist/gorepost/config"
+	"github.com/arachnist/gorepost/config"
 )
 
 const delim byte = '\n'
@@ -32,6 +32,7 @@ type Connection struct {
 	quitrecv         chan struct{}
 	quitkeeper       chan struct{}
 	l                sync.Mutex
+	cfg              *config.Config
 }
 
 // Sender sends IRC messages to server and logs their contents.
@@ -150,7 +151,7 @@ func (c *Connection) Keeper() {
 			close(c.quitrecv)
 		}
 		c.quitrecv = make(chan struct{}, 1)
-		servers := cfg.LookupStringSlice(context, "Servers")
+		servers := c.cfg.LookupStringSlice(context, "Servers")
 
 		server := servers[rand.Intn(len(servers))]
 		log.Println(c.network, "connecting to", server)
@@ -162,12 +163,12 @@ func (c *Connection) Keeper() {
 			log.Println(c.network, "Initializing IRC connection")
 			c.Sender(Message{
 				Command:  "NICK",
-				Trailing: cfg.LookupString(context, "Nick"),
+				Trailing: c.cfg.LookupString(context, "Nick"),
 			})
 			c.Sender(Message{
 				Command:  "USER",
-				Params:   []string{cfg.LookupString(context, "User"), "0", "*"},
-				Trailing: cfg.LookupString(context, "RealName"),
+				Params:   []string{c.cfg.LookupString(context, "User"), "0", "*"},
+				Trailing: c.cfg.LookupString(context, "RealName"),
 			})
 		} else {
 			log.Println(c.network, "connection error", err.Error())
@@ -178,7 +179,7 @@ func (c *Connection) Keeper() {
 }
 
 // Setup performs initialization tasks.
-func (c *Connection) Setup(dispatcher func(func(Message), Message), network string) {
+func (c *Connection) Setup(dispatcher func(func(Message), Message), network string, config *config.Config) {
 	rand.Seed(time.Now().UnixNano())
 
 	c.reconnect = make(chan struct{}, 1)
@@ -187,6 +188,7 @@ func (c *Connection) Setup(dispatcher func(func(Message), Message), network stri
 	c.Quit = make(chan struct{}, 1)
 	c.network = network
 	c.dispatcher = dispatcher
+	c.cfg = config
 
 	c.reconnect <- struct{}{}
 	go c.Keeper()
diff --git a/irc/irc_test.go b/irc/irc_test.go
index a6cad81..0a5dadf 100644
--- a/irc/irc_test.go
+++ b/irc/irc_test.go
@@ -17,7 +17,7 @@ import (
 	"testing"
 	"time"
 
-	cfg "github.com/arachnist/gorepost/config"
+	"github.com/arachnist/gorepost/config"
 )
 
 var expectedOutput = []Message{
@@ -105,7 +105,7 @@ func TestSetup(t *testing.T) {
 	go fakeServer(t)
 
 	var conn Connection
-	conn.Setup(fakeDispatcher, "TestNet")
+	conn.Setup(fakeDispatcher, "TestNet", config.New(configLookupHelper))
 
 	time.Sleep(2 * time.Second)
 
@@ -148,7 +148,6 @@ func configLookupHelper(map[string]string) []string {
 }
 
 func TestMain(m *testing.M) {
-	cfg.SetFileListBuilder(configLookupHelper)
 	log.SetOutput(ioutil.Discard)
 	os.Exit(m.Run())
 }