migrate additional dependencies to ergochat

go.mod

@@ -7,14 +7,16 @@ require (
 	github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
+	github.com/ergochat/confusables v0.0.0-20201108231250-4ab98ab61fb1
+	github.com/ergochat/go-ident v0.0.0-20200511222032-830550b1d775
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/go-test/deep v1.0.6 // indirect
 	github.com/gorilla/websocket v1.4.2
 	github.com/goshuirc/irc-go v0.0.0-20210318074529-bdc2c2cd2fef
 	github.com/onsi/ginkgo v1.12.0 // indirect
 	github.com/onsi/gomega v1.9.0 // indirect
-	github.com/oragono/confusables v0.0.0-20201108231250-4ab98ab61fb1
-	github.com/oragono/go-ident v0.0.0-20200511222032-830550b1d775
+	github.com/oragono/confusables v0.0.0-20201108231250-4ab98ab61fb1 // indirect
+	github.com/oragono/go-ident v0.0.0-20200511222032-830550b1d775 // indirect
 	github.com/stretchr/testify v1.4.0 // indirect
 	github.com/tidwall/buntdb v1.2.3
 	github.com/tidwall/rtree v0.0.0-20201027154624-32188eeb08a8 // indirect
@@ -24,4 +26,4 @@ require (
 	gopkg.in/yaml.v2 v2.4.0
 )
 
-replace github.com/gorilla/websocket => github.com/oragono/websocket v1.4.2-oragono1
+replace github.com/gorilla/websocket => github.com/ergochat/websocket v1.4.2-oragono1

go.sum

@@ -9,6 +9,12 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumC
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 h1:bWDMxwH3px2JBh6AyO7hdCn/PkvCZXii8TGj7sbtEbQ=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
+github.com/ergochat/confusables v0.0.0-20201108231250-4ab98ab61fb1 h1:WLHTOodthVyv5NvYLIvWl112kSFv5IInKKrRN2qpons=
+github.com/ergochat/confusables v0.0.0-20201108231250-4ab98ab61fb1/go.mod h1:mov+uh1DPWsltdQnOdzn08UO9GsJ3MEvhtu0Ci37fdk=
+github.com/ergochat/go-ident v0.0.0-20200511222032-830550b1d775 h1:QSJIdpr3HOzJDPwxT7hp7WbjoZcS+5GqVvsBscqChk0=
+github.com/ergochat/go-ident v0.0.0-20200511222032-830550b1d775/go.mod h1:d2qvgjD0TvGNSvUs+mZgX090RiJlrzUYW6vtANGOy3A=
+github.com/ergochat/websocket v1.4.2-oragono1 h1:plMUunFBM6UoSCIYCKKclTdy/TkkHfUslhOfJQzfueM=
+github.com/ergochat/websocket v1.4.2-oragono1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=

irc/client.go

@@ -16,10 +16,10 @@ import (
 	"sync/atomic"
 	"time"
 
+	ident "github.com/ergochat/go-ident"
 	"github.com/goshuirc/irc-go/ircfmt"
 	"github.com/goshuirc/irc-go/ircmsg"
 	"github.com/goshuirc/irc-go/ircreader"
-	ident "github.com/oragono/go-ident"
 
 	"github.com/ergochat/ergo/irc/caps"
 	"github.com/ergochat/ergo/irc/connection_limits"

irc/strings.go

@@ -10,7 +10,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/oragono/confusables"
+	"github.com/ergochat/confusables"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/secure/precis"
 	"golang.org/x/text/unicode/norm"

vendor/modules.txt

@@ -13,12 +13,18 @@ github.com/dgrijalva/jwt-go
 # github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
 ## explicit
 github.com/docopt/docopt-go
+# github.com/ergochat/confusables v0.0.0-20201108231250-4ab98ab61fb1
+## explicit
+github.com/ergochat/confusables
+# github.com/ergochat/go-ident v0.0.0-20200511222032-830550b1d775
+## explicit
+github.com/ergochat/go-ident
 # github.com/go-sql-driver/mysql v1.6.0
 ## explicit
 github.com/go-sql-driver/mysql
 # github.com/go-test/deep v1.0.6
 ## explicit
-# github.com/gorilla/websocket v1.4.2 => github.com/oragono/websocket v1.4.2-oragono1
+# github.com/gorilla/websocket v1.4.2 => github.com/ergochat/websocket v1.4.2-oragono1
 ## explicit
 github.com/gorilla/websocket
 # github.com/goshuirc/irc-go v0.0.0-20210318074529-bdc2c2cd2fef
@@ -33,10 +39,8 @@ github.com/goshuirc/irc-go/ircutils
 ## explicit
 # github.com/oragono/confusables v0.0.0-20201108231250-4ab98ab61fb1
 ## explicit
-github.com/oragono/confusables
 # github.com/oragono/go-ident v0.0.0-20200511222032-830550b1d775
 ## explicit
-github.com/oragono/go-ident
 # github.com/stretchr/testify v1.4.0
 ## explicit
 # github.com/tidwall/btree v0.4.2
@@ -95,4 +99,4 @@ golang.org/x/text/width
 # gopkg.in/yaml.v2 v2.4.0
 ## explicit
 gopkg.in/yaml.v2
-# github.com/gorilla/websocket => github.com/oragono/websocket v1.4.2-oragono1
+# github.com/gorilla/websocket => github.com/ergochat/websocket v1.4.2-oragono1