Skip to content

Commit 4ad10ac

Browse files
65436543
authoredNov 3, 2020
Vendor: mvdan.cc/xurls v2.1.0 -> v2.2.0 (#13407)
·
v1.13.7v1.13.0-rc2
1 parent cbdbae2 commit 4ad10ac

File tree

9 files changed

+40
-27
lines changed

9 files changed

+40
-27
lines changed
 

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ require (
117117
gopkg.in/ini.v1 v1.61.0
118118
gopkg.in/ldap.v3 v3.0.2
119119
gopkg.in/yaml.v2 v2.3.0
120-
mvdan.cc/xurls/v2 v2.1.0
120+
mvdan.cc/xurls/v2 v2.2.0
121121
strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
122122
xorm.io/builder v0.3.7
123123
xorm.io/xorm v1.0.5

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,7 @@ github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6So
768768
github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
769769
github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
770770
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
771+
github.com/rogpeppe/go-internal v1.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
771772
github.com/rs/xid v1.2.1 h1:mhH9Nq+C1fY2l1XIpgxIiUOfNpRBYH1kKcr+qfKgjRc=
772773
github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
773774
github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
@@ -1196,8 +1197,7 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
11961197
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
11971198
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
11981199
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
1199-
mvdan.cc/xurls/v2 v2.1.0 h1:KaMb5GLhlcSX+e+qhbRJODnUUBvlw01jt4yrjFIHAuA=
1200-
mvdan.cc/xurls/v2 v2.1.0/go.mod h1:5GrSd9rOnKOpZaji1OZLYL/yeAAtGDlo/cFe+8K5n8E=
1200+
mvdan.cc/xurls/v2 v2.2.0/go.mod h1:EV1RMtya9D6G5DMYPGD8zTQzaHet6Jh8gFlRgGRJeO8=
12011201
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
12021202
strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251 h1:mUcz5b3FJbP5Cvdq7Khzn6J9OCUQJaBwgBkCR+MOwSs=
12031203
strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251/go.mod h1:FJGmPh3vz9jSos1L/F91iAgnC/aejc0wIIrF2ZwJxdY=

‎vendor/modules.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -954,7 +954,7 @@ gopkg.in/warnings.v0
954954
gopkg.in/yaml.v2
955955
# gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
956956
gopkg.in/yaml.v3
957-
# mvdan.cc/xurls/v2 v2.1.0
957+
# mvdan.cc/xurls/v2 v2.2.0
958958
## explicit
959959
mvdan.cc/xurls/v2
960960
# strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251

‎vendor/mvdan.cc/xurls/v2/README.md

+8-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![GoDoc](https://godoc.org/mvdan.cc/xurls?status.svg)](https://godoc.org/mvdan.cc/xurls)
44

5-
Extract urls from text using regular expressions. Requires Go 1.12 or later.
5+
Extract urls from text using regular expressions. Requires Go 1.13 or later.
66

77
```go
88
import "mvdan.cc/xurls/v2"
@@ -18,13 +18,18 @@ func main() {
1818
}
1919
```
2020

21-
Note that the funcs compile regexes, so avoid calling them repeatedly.
21+
Since API is centered around [regexp.Regexp](https://golang.org/pkg/regexp/#Regexp),
22+
many other methods are available, such as finding the [byte indexes](https://golang.org/pkg/regexp/#Regexp.FindAllIndex)
23+
for all matches.
24+
25+
Note that calling the exposed functions means compiling a regular expression, so
26+
repeated calls should be avoided.
2227

2328
#### cmd/xurls
2429

2530
To install the tool globally:
2631

27-
go get mvdan.cc/xurls/cmd/xurls
32+
cd $(mktemp -d); go mod init tmp; GO111MODULE=on go get mvdan.cc/xurls/v2/cmd/xurls
2833

2934
```shell
3035
$ echo "Do gophers live in http://golang.org?" | xurls

‎vendor/mvdan.cc/xurls/v2/go.mod

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
module mvdan.cc/xurls/v2
22

3-
go 1.13
3+
go 1.14
4+
5+
require (
6+
github.com/rogpeppe/go-internal v1.5.2
7+
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
8+
)

‎vendor/mvdan.cc/xurls/v2/go.sum

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
2+
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
3+
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
4+
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
5+
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
6+
github.com/rogpeppe/go-internal v1.5.2 h1:qLvObTrvO/XRCqmkKxUlOBc48bI3efyDuAZe25QiF0w=
7+
github.com/rogpeppe/go-internal v1.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
8+
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
9+
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
10+
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
11+
gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8=
12+
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=

‎vendor/mvdan.cc/xurls/v2/schemes.go

+3
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ var Schemes = []string{
6666
`dpp`,
6767
`drm`,
6868
`drop`,
69+
`dtmi`,
6970
`dtn`,
7071
`dvb`,
7172
`ed2k`,
@@ -226,6 +227,7 @@ var Schemes = []string{
226227
`pack`,
227228
`palm`,
228229
`paparazzi`,
230+
`payment`,
229231
`payto`,
230232
`pkcs11`,
231233
`platform`,
@@ -238,6 +240,7 @@ var Schemes = []string{
238240
`pttp`,
239241
`qb`,
240242
`query`,
243+
`quic-transport`,
241244
`redis`,
242245
`rediss`,
243246
`reload`,

‎vendor/mvdan.cc/xurls/v2/tlds.go

+5-17
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ var TLDs = []string{
5757
`alsace`,
5858
`alstom`,
5959
`am`,
60+
`amazon`,
6061
`americanexpress`,
6162
`americanfamily`,
6263
`amex`,
@@ -219,7 +220,6 @@ var TLDs = []string{
219220
`career`,
220221
`careers`,
221222
`cars`,
222-
`cartier`,
223223
`casa`,
224224
`case`,
225225
`caseih`,
@@ -252,7 +252,6 @@ var TLDs = []string{
252252
`chintai`,
253253
`christmas`,
254254
`chrome`,
255-
`chrysler`,
256255
`church`,
257256
`ci`,
258257
`cipriani`,
@@ -366,7 +365,6 @@ var TLDs = []string{
366365
`do`,
367366
`docs`,
368367
`doctor`,
369-
`dodge`,
370368
`dog`,
371369
`domains`,
372370
`dot`,
@@ -411,7 +409,6 @@ var TLDs = []string{
411409
`eurovision`,
412410
`eus`,
413411
`events`,
414-
`everbank`,
415412
`exchange`,
416413
`expert`,
417414
`exposed`,
@@ -701,12 +698,10 @@ var TLDs = []string{
701698
`kz`,
702699
`la`,
703700
`lacaixa`,
704-
`ladbrokes`,
705701
`lamborghini`,
706702
`lamer`,
707703
`lancaster`,
708704
`lancia`,
709-
`lancome`,
710705
`land`,
711706
`landrover`,
712707
`lanxess`,
@@ -727,7 +722,6 @@ var TLDs = []string{
727722
`lexus`,
728723
`lgbt`,
729724
`li`,
730-
`liaison`,
731725
`lidl`,
732726
`life`,
733727
`lifeinsurance`,
@@ -829,15 +823,13 @@ var TLDs = []string{
829823
`monash`,
830824
`money`,
831825
`monster`,
832-
`mopar`,
833826
`mormon`,
834827
`mortgage`,
835828
`moscow`,
836829
`moto`,
837830
`motorcycles`,
838831
`mov`,
839832
`movie`,
840-
`movistar`,
841833
`mp`,
842834
`mq`,
843835
`mr`,
@@ -856,7 +848,6 @@ var TLDs = []string{
856848
`mz`,
857849
`na`,
858850
`nab`,
859-
`nadex`,
860851
`nagoya`,
861852
`name`,
862853
`nationwide`,
@@ -958,7 +949,6 @@ var TLDs = []string{
958949
`photography`,
959950
`photos`,
960951
`physio`,
961-
`piaget`,
962952
`pics`,
963953
`pictet`,
964954
`pictures`,
@@ -1154,13 +1144,13 @@ var TLDs = []string{
11541144
`song`,
11551145
`sony`,
11561146
`soy`,
1147+
`spa`,
11571148
`space`,
11581149
`sport`,
11591150
`spot`,
11601151
`spreadbetting`,
11611152
`sr`,
11621153
`srl`,
1163-
`srt`,
11641154
`ss`,
11651155
`st`,
11661156
`stada`,
@@ -1213,7 +1203,6 @@ var TLDs = []string{
12131203
`tech`,
12141204
`technology`,
12151205
`tel`,
1216-
`telefonica`,
12171206
`temasek`,
12181207
`tennis`,
12191208
`teva`,
@@ -1273,7 +1262,6 @@ var TLDs = []string{
12731262
`ua`,
12741263
`ubank`,
12751264
`ubs`,
1276-
`uconnect`,
12771265
`ug`,
12781266
`uk`,
12791267
`unicom`,
@@ -1309,7 +1297,6 @@ var TLDs = []string{
13091297
`virgin`,
13101298
`visa`,
13111299
`vision`,
1312-
`vistaprint`,
13131300
`viva`,
13141301
`vivo`,
13151302
`vlaanderen`,
@@ -1328,7 +1315,6 @@ var TLDs = []string{
13281315
`walter`,
13291316
`wang`,
13301317
`wanggou`,
1331-
`warman`,
13321318
`watch`,
13331319
`watches`,
13341320
`weather`,
@@ -1388,6 +1374,7 @@ var TLDs = []string{
13881374
`zuerich`,
13891375
`zw`,
13901376
`ελ`,
1377+
`ευ`,
13911378
`бг`,
13921379
`бел`,
13931380
`дети`,
@@ -1469,6 +1456,7 @@ var TLDs = []string{
14691456
`ไทย`,
14701457
`გე`,
14711458
`みんな`,
1459+
`アマゾン`,
14721460
`クラウド`,
14731461
`グーグル`,
14741462
`コム`,
@@ -1481,6 +1469,7 @@ var TLDs = []string{
14811469
`中国`,
14821470
`中國`,
14831471
`中文网`,
1472+
`亚马逊`,
14841473
`企业`,
14851474
`佛山`,
14861475
`信息`,
@@ -1501,7 +1490,6 @@ var TLDs = []string{
15011490
`天主教`,
15021491
`娱乐`,
15031492
`家電`,
1504-
`工行`,
15051493
`广东`,
15061494
`微博`,
15071495
`慈善`,

‎vendor/mvdan.cc/xurls/v2/xurls.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const (
1919
iriChar = letter + mark + number
2020
currency = `\p{Sc}`
2121
otherSymb = `\p{So}`
22-
endChar = iriChar + `/\-+&~%=#` + currency + otherSymb
22+
endChar = iriChar + `/\-_+&~%=#` + currency + otherSymb
2323
otherPunc = `\p{Po}`
2424
midChar = endChar + "_*" + otherPunc
2525
wellParen = `\([` + midChar + `]*(\([` + midChar + `]*\)[` + midChar + `]*)*\)`
@@ -76,7 +76,7 @@ func relaxedExp() string {
7676
knownTLDs := anyOf(append(TLDs, PseudoTLDs...)...)
7777
site := domain + `(?i)(` + punycode + `|` + knownTLDs + `)(?-i)`
7878
hostName := `(` + site + `|` + ipAddr + `)`
79-
webURL := hostName + port + `(/|/` + pathCont + `?|\b|(?m)$)`
79+
webURL := hostName + port + `(/|/` + pathCont + `)?`
8080
return strictExp() + `|` + webURL
8181
}
8282

0 commit comments

Comments
 (0)
Please sign in to comment.