Fix open graph images (#597)

gauntface · web-flow · commit 21455f224f76 · 2025-01-26T02:22:09.000Z
diff --git a/go.mod b/go.mod
@@ -41,7 +41,7 @@ require (
 	github.com/otiai10/mint v1.6.3 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/stretchr/testify v1.9.0 // indirect
-	golang.org/x/image v0.8.0 // indirect
+	golang.org/x/image v0.23.0 // indirect
 	golang.org/x/sys v0.29.0 // indirect
 	golang.org/x/term v0.28.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
diff --git a/go.sum b/go.sum
@@ -2382,6 +2382,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.8.0 h1:agUcRXV/+w6L9ryntYYsF2x9fQTMd4T8fiiYXAVW6Jg=
 golang.org/x/image v0.8.0/go.mod h1:PwLxp3opCYg4WR2WO9P0L6ESnsD6bLTWcw8zanLMVFM=
+golang.org/x/image v0.23.0 h1:HseQ7c2OpPKTPVzNjG5fwJsOTCiiwS4QdsYi5XU6H68=
+golang.org/x/image v0.23.0/go.mod h1:wJJBTdLfCCf3tiHa1fNxpZmUI4mmoZvwMCPP0ddoNKY=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
diff --git a/manipulations/opengraphimg/opengraphimg.go b/manipulations/opengraphimg/opengraphimg.go
@@ -93,15 +93,15 @@ func getSuitableImg(runtime manipulations.Runtime, imgPath string) (*genimgs.Gen
 	}
 
 	imgsByTypes := genimgs.GroupByType(imgs)
-	imgsByType := imgsByTypes[""]
-	if len(imgsByType) == 0 {
+	basicImages := imgsByTypes[""]
+	if len(basicImages) == 0 {
 		return nil, nil
 	}
 
-	sort.Slice(imgs, func(i, j int) bool {
-		return imgs[i].Size > imgs[j].Size
+	sort.Slice(basicImages, func(i, j int) bool {
+		return basicImages[i].Size > basicImages[j].Size
 	})
-	for _, i := range imgs {
+	for _, i := range basicImages {
 		if i.Size <= RECOMMENDED_OG_IMG_WIDTH {
 			addImgCache(imgPath, i)
 			return &i, nil
diff --git a/manipulations/opengraphimg/opengraphimg_test.go b/manipulations/opengraphimg/opengraphimg_test.go
@@ -115,6 +115,31 @@ func TestManipulator(t *testing.T) {
 			},
 			wantHTML: `<html><head><meta content="http://base-url.com/images/default-social.1200xabc.png" property="og:image"/></head><body></body></html>`,
 		},
+
+		{
+			description: "use basic image and not other image",
+			findNodes:   htmlparsing.FindNodesByTag,
+			doc:         MustGetNode(t, `<meta property="og:image" content="/images/default-social.png" />`),
+			genimgsLookupSizes: func(s3 *s3.Client, conf *config.Config, imgPath string) ([]genimgs.GenImg, error) {
+				return []genimgs.GenImg{
+					{
+						Size: RECOMMENDED_OG_IMG_WIDTH,
+						URL:  "/images/default-social.1200xabc.png",
+					},
+					{
+						Size: RECOMMENDED_OG_IMG_WIDTH,
+						Type: "image/webp",
+						URL:  "/images/default-social.1200xabc.webp",
+					},
+					{
+						Size: RECOMMENDED_OG_IMG_WIDTH,
+						Type: "image/avif",
+						URL:  "/images/default-social.1200xabc.avif",
+					},
+				}, nil
+			},
+			wantHTML: `<html><head><meta content="http://base-url.com/images/default-social.1200xabc.png" property="og:image"/></head><body></body></html>`,
+		},
 	}
 
 	for _, tt := range tests {
