Merge pull request #32 from nickvanw/bump-ircx-v2

Bump to using `irc.v2`

Author: nickvanw

bot.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
-	"gopkg.in/sorcix/irc.v1"
+	irc "gopkg.in/sorcix/irc.v2"
 )
 
 var defaultLogger = log.NewNopLogger()
@@ -105,9 +105,8 @@ func (b *Bot) connectMessages() []*irc.Message {
 		Params:  []string{b.OriginalName},
 	})
 	messages = append(messages, &irc.Message{
-		Command:  irc.USER,
-		Params:   []string{b.Config.User, "0", "*"},
-		Trailing: b.Config.User,
+		Command: irc.USER,
+		Params:  []string{b.Config.User, "0", "*", b.Config.User},
 	})
 	return messages
 }

example/main.go

@@ -4,8 +4,8 @@ import (
 	"flag"
 	"log"
 
-	"github.com/nickvanw/ircx"
-	"gopkg.in/sorcix/irc.v1"
+	"github.com/nickvanw/ircx/v2"
+	irc "gopkg.in/sorcix/irc.v2"
 )
 
 var (
@@ -42,8 +42,7 @@ func RegisterConnect(s ircx.Sender, m *irc.Message) {
 
 func PingHandler(s ircx.Sender, m *irc.Message) {
 	s.Send(&irc.Message{
-		Command:  irc.PONG,
-		Params:   m.Params,
-		Trailing: m.Trailing,
+		Command: irc.PONG,
+		Params:  m.Params,
 	})
 }

go.mod

@@ -1,10 +1,10 @@
-module github.com/nickvanw/ircx
+module github.com/nickvanw/ircx/v2
 
 go 1.10
 
 require (
 	github.com/go-kit/kit v0.8.0
 	github.com/go-logfmt/logfmt v0.4.0 // indirect
 	github.com/go-stack/stack v1.8.0 // indirect
-	gopkg.in/sorcix/irc.v1 v1.1.4
+	gopkg.in/sorcix/irc.v2 v2.0.0-20180626144439-63eed78b082d
 )

go.sum

@@ -6,5 +6,5 @@ github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-gopkg.in/sorcix/irc.v1 v1.1.4 h1:ejxu1vDyqn1d+I5WXzh93pMDq5NqdwBl3V/eN5c2we8=
-gopkg.in/sorcix/irc.v1 v1.1.4/go.mod h1:CHwY3DGuZpB6/OvF+fj4Jlvnj6QeS56EUTDoQkuAePM=
+gopkg.in/sorcix/irc.v2 v2.0.0-20180626144439-63eed78b082d h1:Qa1MG3xsTnT+SyhctasXKjZX1H7PtTcPRGFr5pyiG2E=
+gopkg.in/sorcix/irc.v2 v2.0.0-20180626144439-63eed78b082d/go.mod h1:9LLe1SvUK2YoWyIuJ+AParKHhu749G8oM+HTQQMZz9E=

sender.go

@@ -3,7 +3,7 @@ package ircx
 import (
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
-	"gopkg.in/sorcix/irc.v1"
+	irc "gopkg.in/sorcix/irc.v2"
 )
 
 // Sender is an interface for sending IRC messages