MM-31171 Fork OpenGraph library to handle bad HTML from YouTube (#16528)

Этот коммит содержится в:
Harrison Healey
2020-12-10 15:42:23 -05:00
коммит произвёл GitHub
родитель 599e8f67e6
Коммит 1367418e3c
4 изменённых файлов: 12 добавлений и 10 удалений

2
go.mod
Просмотреть файл

@@ -139,3 +139,5 @@ require (
) )
replace github.com/NYTimes/gziphandler v1.1.1 => github.com/agnivade/gziphandler v1.1.2-0.20200815170021-7481835cb745 replace github.com/NYTimes/gziphandler v1.1.1 => github.com/agnivade/gziphandler v1.1.2-0.20200815170021-7481835cb745
replace github.com/dyatlov/go-opengraph => github.com/hmhealey/go-opengraph v0.0.0-20201209151214-f2d823730dba

2
go.sum
Просмотреть файл

@@ -413,6 +413,8 @@ github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/J
github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce h1:7UnVY3T/ZnHUrfviiAgIUjg2PXxsQfs5bphsG8F7Keo= github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce h1:7UnVY3T/ZnHUrfviiAgIUjg2PXxsQfs5bphsG8F7Keo=
github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
github.com/hmhealey/go-opengraph v0.0.0-20201209151214-f2d823730dba h1:2vMJwzNFzJcB6OSIZWNcjTGn4fWDcZTDv3DNPWL/OrA=
github.com/hmhealey/go-opengraph v0.0.0-20201209151214-f2d823730dba/go.mod h1:IRzuuhgRxsskfZk1qE3U0gStYsrnZR3wPpntC5Dkv5g=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
github.com/icrowley/fake v0.0.0-20180203215853-4178557ae428 h1:Mo9W14pwbO9VfRe+ygqZ8dFbPpoIK1HFrG/zjTuQ+nc= github.com/icrowley/fake v0.0.0-20180203215853-4178557ae428 h1:Mo9W14pwbO9VfRe+ygqZ8dFbPpoIK1HFrG/zjTuQ+nc=

3
vendor/github.com/dyatlov/go-opengraph/opengraph/opengraph.go сгенерированный поставляемый
Просмотреть файл

@@ -119,9 +119,6 @@ func (og *OpenGraph) ProcessHTML(buffer io.Reader) error {
return z.Err() return z.Err()
case html.StartTagToken, html.SelfClosingTagToken, html.EndTagToken: case html.StartTagToken, html.SelfClosingTagToken, html.EndTagToken:
name, hasAttr := z.TagName() name, hasAttr := z.TagName()
if atom.Lookup(name) == atom.Body {
return nil // OpenGraph is only in head, so we don't need body
}
if atom.Lookup(name) != atom.Meta || !hasAttr { if atom.Lookup(name) != atom.Meta || !hasAttr {
continue continue
} }

3
vendor/modules.txt поставляемый
Просмотреть файл

@@ -176,7 +176,7 @@ github.com/dsnet/compress/bzip2/internal/sais
github.com/dsnet/compress/internal github.com/dsnet/compress/internal
github.com/dsnet/compress/internal/errors github.com/dsnet/compress/internal/errors
github.com/dsnet/compress/internal/prefix github.com/dsnet/compress/internal/prefix
# github.com/dyatlov/go-opengraph v0.0.0-20180429202543-816b6608b3c8 # github.com/dyatlov/go-opengraph v0.0.0-20180429202543-816b6608b3c8 => github.com/hmhealey/go-opengraph v0.0.0-20201209151214-f2d823730dba
## explicit ## explicit
github.com/dyatlov/go-opengraph/opengraph github.com/dyatlov/go-opengraph/opengraph
# github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c # github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c
@@ -919,3 +919,4 @@ willnorris.com/go/gifresize
## explicit ## explicit
willnorris.com/go/imageproxy willnorris.com/go/imageproxy
willnorris.com/go/imageproxy/third_party/http willnorris.com/go/imageproxy/third_party/http
# github.com/dyatlov/go-opengraph => github.com/hmhealey/go-opengraph v0.0.0-20201209151214-f2d823730dba