From a76643116f7083f64c612914d59dc3fe16c616c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 28 Jan 2020 10:56:45 +0100 Subject: [PATCH] Making private opengraph methods in the app layer (#13759) --- app/opengraph.go | 10 +++++----- app/post_metadata.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/opengraph.go b/app/opengraph.go index a09c70c3bc..1d62e9de26 100644 --- a/app/opengraph.go +++ b/app/opengraph.go @@ -23,15 +23,15 @@ func (a *App) GetOpenGraphMetadata(requestURL string) *opengraph.OpenGraph { return nil } defer res.Body.Close() - return a.ParseOpenGraphMetadata(requestURL, res.Body, res.Header.Get("Content-Type")) + return a.parseOpenGraphMetadata(requestURL, res.Body, res.Header.Get("Content-Type")) } -func (a *App) ParseOpenGraphMetadata(requestURL string, body io.Reader, contentType string) *opengraph.OpenGraph { +func (a *App) parseOpenGraphMetadata(requestURL string, body io.Reader, contentType string) *opengraph.OpenGraph { og := opengraph.NewOpenGraph() body = forceHTMLEncodingToUTF8(io.LimitReader(body, MaxOpenGraphResponseSize), contentType) if err := og.ProcessHTML(body); err != nil { - mlog.Warn("ParseOpenGraphMetadata processing failed", mlog.String("requestURL", requestURL), mlog.Err(err)) + mlog.Warn("parseOpenGraphMetadata processing failed", mlog.String("requestURL", requestURL), mlog.Err(err)) } makeOpenGraphURLsAbsolute(og, requestURL) @@ -40,7 +40,7 @@ func (a *App) ParseOpenGraphMetadata(requestURL string, body io.Reader, contentT // If image proxy enabled modify open graph data to feed though proxy if toProxyURL := a.ImageProxyAdder(); toProxyURL != nil { - og = OpenGraphDataWithProxyAddedToImageURLs(og, toProxyURL) + og = openGraphDataWithProxyAddedToImageURLs(og, toProxyURL) } // The URL should be the link the user provided in their message, not a redirected one. @@ -103,7 +103,7 @@ func makeOpenGraphURLsAbsolute(og *opengraph.OpenGraph, requestURL string) { } } -func OpenGraphDataWithProxyAddedToImageURLs(ogdata *opengraph.OpenGraph, toProxyURL func(string) string) *opengraph.OpenGraph { +func openGraphDataWithProxyAddedToImageURLs(ogdata *opengraph.OpenGraph, toProxyURL func(string) string) *opengraph.OpenGraph { for _, image := range ogdata.Images { var url string if image.SecureURL != "" { diff --git a/app/post_metadata.go b/app/post_metadata.go index fcf544c4f2..6680db99d4 100644 --- a/app/post_metadata.go +++ b/app/post_metadata.go @@ -512,7 +512,7 @@ func (a *App) parseLinkMetadata(requestURL string, body io.Reader, contentType s image, err := parseImages(io.LimitReader(body, MaxMetadataImageSize)) return nil, image, err } else if strings.HasPrefix(contentType, "text/html") { - og := a.ParseOpenGraphMetadata(requestURL, body, contentType) + og := a.parseOpenGraphMetadata(requestURL, body, contentType) // The OpenGraph library and Go HTML library don't error for malformed input, so check that at least // one of these required fields exists before returning the OpenGraph data