Browse Source

migrate additional dependencies to ergochat

tags/v2.7.0-rc1
Shivaram Lingamneni 2 years ago
parent
commit
7944871eb6

+ 5
- 3
go.mod View File

7
 	github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962
7
 	github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962
8
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
8
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
9
 	github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
9
 	github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
10
+	github.com/ergochat/confusables v0.0.0-20201108231250-4ab98ab61fb1
11
+	github.com/ergochat/go-ident v0.0.0-20200511222032-830550b1d775
10
 	github.com/go-sql-driver/mysql v1.6.0
12
 	github.com/go-sql-driver/mysql v1.6.0
11
 	github.com/go-test/deep v1.0.6 // indirect
13
 	github.com/go-test/deep v1.0.6 // indirect
12
 	github.com/gorilla/websocket v1.4.2
14
 	github.com/gorilla/websocket v1.4.2
13
 	github.com/goshuirc/irc-go v0.0.0-20210318074529-bdc2c2cd2fef
15
 	github.com/goshuirc/irc-go v0.0.0-20210318074529-bdc2c2cd2fef
14
 	github.com/onsi/ginkgo v1.12.0 // indirect
16
 	github.com/onsi/ginkgo v1.12.0 // indirect
15
 	github.com/onsi/gomega v1.9.0 // indirect
17
 	github.com/onsi/gomega v1.9.0 // indirect
16
-	github.com/oragono/confusables v0.0.0-20201108231250-4ab98ab61fb1
17
-	github.com/oragono/go-ident v0.0.0-20200511222032-830550b1d775
18
+	github.com/oragono/confusables v0.0.0-20201108231250-4ab98ab61fb1 // indirect
19
+	github.com/oragono/go-ident v0.0.0-20200511222032-830550b1d775 // indirect
18
 	github.com/stretchr/testify v1.4.0 // indirect
20
 	github.com/stretchr/testify v1.4.0 // indirect
19
 	github.com/tidwall/buntdb v1.2.3
21
 	github.com/tidwall/buntdb v1.2.3
20
 	github.com/tidwall/rtree v0.0.0-20201027154624-32188eeb08a8 // indirect
22
 	github.com/tidwall/rtree v0.0.0-20201027154624-32188eeb08a8 // indirect
24
 	gopkg.in/yaml.v2 v2.4.0
26
 	gopkg.in/yaml.v2 v2.4.0
25
 )
27
 )
26
 
28
 
27
-replace github.com/gorilla/websocket => github.com/oragono/websocket v1.4.2-oragono1
29
+replace github.com/gorilla/websocket => github.com/ergochat/websocket v1.4.2-oragono1

+ 6
- 0
go.sum View File

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

+ 1
- 1
irc/client.go View File

16
 	"sync/atomic"
16
 	"sync/atomic"
17
 	"time"
17
 	"time"
18
 
18
 
19
+	ident "github.com/ergochat/go-ident"
19
 	"github.com/goshuirc/irc-go/ircfmt"
20
 	"github.com/goshuirc/irc-go/ircfmt"
20
 	"github.com/goshuirc/irc-go/ircmsg"
21
 	"github.com/goshuirc/irc-go/ircmsg"
21
 	"github.com/goshuirc/irc-go/ircreader"
22
 	"github.com/goshuirc/irc-go/ircreader"
22
-	ident "github.com/oragono/go-ident"
23
 
23
 
24
 	"github.com/ergochat/ergo/irc/caps"
24
 	"github.com/ergochat/ergo/irc/caps"
25
 	"github.com/ergochat/ergo/irc/connection_limits"
25
 	"github.com/ergochat/ergo/irc/connection_limits"

+ 1
- 1
irc/strings.go View File

10
 	"regexp"
10
 	"regexp"
11
 	"strings"
11
 	"strings"
12
 
12
 
13
-	"github.com/oragono/confusables"
13
+	"github.com/ergochat/confusables"
14
 	"golang.org/x/text/cases"
14
 	"golang.org/x/text/cases"
15
 	"golang.org/x/text/secure/precis"
15
 	"golang.org/x/text/secure/precis"
16
 	"golang.org/x/text/unicode/norm"
16
 	"golang.org/x/text/unicode/norm"

vendor/github.com/oragono/confusables/.gitignore → vendor/github.com/ergochat/confusables/.gitignore View File


vendor/github.com/oragono/confusables/LICENSE → vendor/github.com/ergochat/confusables/LICENSE View File


vendor/github.com/oragono/confusables/README.md → vendor/github.com/ergochat/confusables/README.md View File


vendor/github.com/oragono/confusables/confusables.go → vendor/github.com/ergochat/confusables/confusables.go View File


vendor/github.com/oragono/confusables/tables.go → vendor/github.com/ergochat/confusables/tables.go View File


vendor/github.com/oragono/confusables/tweaks.go → vendor/github.com/ergochat/confusables/tweaks.go View File


vendor/github.com/oragono/go-ident/LICENSE → vendor/github.com/ergochat/go-ident/LICENSE View File


vendor/github.com/oragono/go-ident/README.md → vendor/github.com/ergochat/go-ident/README.md View File


vendor/github.com/oragono/go-ident/client.go → vendor/github.com/ergochat/go-ident/client.go View File


+ 8
- 4
vendor/modules.txt View File

13
 # github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
13
 # github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
14
 ## explicit
14
 ## explicit
15
 github.com/docopt/docopt-go
15
 github.com/docopt/docopt-go
16
+# github.com/ergochat/confusables v0.0.0-20201108231250-4ab98ab61fb1
17
+## explicit
18
+github.com/ergochat/confusables
19
+# github.com/ergochat/go-ident v0.0.0-20200511222032-830550b1d775
20
+## explicit
21
+github.com/ergochat/go-ident
16
 # github.com/go-sql-driver/mysql v1.6.0
22
 # github.com/go-sql-driver/mysql v1.6.0
17
 ## explicit
23
 ## explicit
18
 github.com/go-sql-driver/mysql
24
 github.com/go-sql-driver/mysql
19
 # github.com/go-test/deep v1.0.6
25
 # github.com/go-test/deep v1.0.6
20
 ## explicit
26
 ## explicit
21
-# github.com/gorilla/websocket v1.4.2 => github.com/oragono/websocket v1.4.2-oragono1
27
+# github.com/gorilla/websocket v1.4.2 => github.com/ergochat/websocket v1.4.2-oragono1
22
 ## explicit
28
 ## explicit
23
 github.com/gorilla/websocket
29
 github.com/gorilla/websocket
24
 # github.com/goshuirc/irc-go v0.0.0-20210318074529-bdc2c2cd2fef
30
 # github.com/goshuirc/irc-go v0.0.0-20210318074529-bdc2c2cd2fef
33
 ## explicit
39
 ## explicit
34
 # github.com/oragono/confusables v0.0.0-20201108231250-4ab98ab61fb1
40
 # github.com/oragono/confusables v0.0.0-20201108231250-4ab98ab61fb1
35
 ## explicit
41
 ## explicit
36
-github.com/oragono/confusables
37
 # github.com/oragono/go-ident v0.0.0-20200511222032-830550b1d775
42
 # github.com/oragono/go-ident v0.0.0-20200511222032-830550b1d775
38
 ## explicit
43
 ## explicit
39
-github.com/oragono/go-ident
40
 # github.com/stretchr/testify v1.4.0
44
 # github.com/stretchr/testify v1.4.0
41
 ## explicit
45
 ## explicit
42
 # github.com/tidwall/btree v0.4.2
46
 # github.com/tidwall/btree v0.4.2
95
 # gopkg.in/yaml.v2 v2.4.0
99
 # gopkg.in/yaml.v2 v2.4.0
96
 ## explicit
100
 ## explicit
97
 gopkg.in/yaml.v2
101
 gopkg.in/yaml.v2
98
-# github.com/gorilla/websocket => github.com/oragono/websocket v1.4.2-oragono1
102
+# github.com/gorilla/websocket => github.com/ergochat/websocket v1.4.2-oragono1

Loading…
Cancel
Save