add more image urls

cmd/dealsbot/api/gog.go

@@ -6,7 +6,6 @@ import (
 	"log/slog"
 	"net/http"
 	"regexp"
-	"strings"
 )
 
 type GogStruct struct {
@@ -67,7 +66,7 @@ func (e GogStruct) Load() error {
 				return
 			case tt == html.StartTagToken:
 				t := bodyStore.Token()
-				if t.Data != "a" {
+				if t.Data != "a" { // only <a> tag
 					continue
 				}
 				for _, a := range t.Attr {
@@ -105,44 +104,60 @@ func (e GogStruct) Load() error {
 		}
 		bodyGame := html.NewTokenizer(resGame.Body)
 
-		func() {
+		title, image := gogParseMeta(bodyGame)
-			for {
+		url := fmt.Sprintf("%v%v", e.baseUrl, appID)
-				tt := bodyGame.Next()
+		id := fmt.Sprintf("%v%v", e.idPrefix, appID)
-
+		e.deals[id] = Deal{
-				switch {
+			Id:    id,
-				case tt == html.ErrorToken:
+			Title: title,
-					// file end or error
+			Url:   url,
-					return
+			Image: image,
-				case tt == html.StartTagToken:
+		}
-					t := bodyGame.Token()
-					if t.Data != "h1" {
-						continue
-					}
-					for _, a := range t.Attr {
-						if !(a.Key == "class" && a.Val == "productcard-basics__title") {
-							continue
-						}
-						if tt = bodyGame.Next(); tt != html.TextToken {
-							continue
-						}
-						id := fmt.Sprintf("%v%v", e.idPrefix, appID)
-						title := strings.TrimSpace(bodyGame.Token().Data)
-						url := fmt.Sprintf("%v%v", e.baseUrl, appID)
-
-						e.deals[id] = Deal{
-							Id:    id,
-							Title: title,
-							Url:   url,
-						}
-					}
-				}
-			}
-		}()
 	}
 
 	return nil
 }
 
+func gogParseMeta(htmlBody *html.Tokenizer) (string, string) {
+	var title, image string
+	func() {
+		for {
+			tt := htmlBody.Next()
+
+			switch {
+			case tt == html.ErrorToken:
+				// file end or error
+				return
+			case tt == html.StartTagToken:
+				t := htmlBody.Token()
+				if t.Data != "meta" {
+					continue
+				}
+				for _, a := range t.Attr {
+					if a.Key == "property" && a.Val == "og:title" {
+						for _, c := range t.Attr {
+							if c.Key == "content" {
+								title = c.Val
+							}
+						}
+					}
+					if a.Key == "property" && a.Val == "og:image" {
+						for _, c := range t.Attr {
+							if c.Key == "content" {
+								image = c.Val
+							}
+						}
+					}
+				}
+				if title != "" && image != "" {
+					return
+				}
+			}
+		}
+	}()
+	return title, image
+}
+
 func (e GogStruct) Get() []Deal {
 	var deals []Deal
 	for _, deal := range e.deals {

cmd/dealsbot/api/gogfront.go

@@ -6,7 +6,6 @@ import (
 	"log/slog"
 	"net/http"
 	"regexp"
-	"strings"
 )
 
 type GogFrontStruct struct {
@@ -67,7 +66,7 @@ func (e GogFrontStruct) Load() error {
 				return
 			case tt == html.StartTagToken:
 				t := bodyStore.Token()
-				if t.Data != "a" {
+				if t.Data != "a" { // only <a> tag
 					continue
 				}
 				for _, a := range t.Attr {
@@ -105,39 +104,15 @@ func (e GogFrontStruct) Load() error {
 		}
 		bodyGame := html.NewTokenizer(resGame.Body)
 
-		func() {
+		title, image := gogParseMeta(bodyGame)
-			for {
+		url := fmt.Sprintf("%v%v", e.baseUrl, appID)
-				tt := bodyGame.Next()
+		id := fmt.Sprintf("%v%v", e.idPrefix, appID)
-
+		e.deals[id] = Deal{
-				switch {
+			Id:    id,
-				case tt == html.ErrorToken:
+			Title: title,
-					// file end or error
+			Url:   url,
-					return
+			Image: image,
-				case tt == html.StartTagToken:
+		}
-					t := bodyGame.Token()
-					if t.Data != "h1" {
-						continue
-					}
-					for _, a := range t.Attr {
-						if !(a.Key == "class" && a.Val == "productcard-basics__title") {
-							continue
-						}
-						if tt = bodyGame.Next(); tt != html.TextToken {
-							continue
-						}
-						id := fmt.Sprintf("%v%v", e.idPrefix, appID)
-						title := strings.TrimSpace(bodyGame.Token().Data)
-						url := fmt.Sprintf("%v%v", e.baseUrl, appID)
-
-						e.deals[id] = Deal{
-							Id:    id,
-							Title: title,
-							Url:   url,
-						}
-					}
-				}
-			}
-		}()
 	}
 
 	return nil

cmd/dealsbot/api/humblebundle.go

@@ -20,6 +20,7 @@ type HumbleBundleStruct struct {
 }
 
 func NewHumbleBundleApi(logger *slog.Logger) HumbleBundleStruct {
+	// TODO: does this still work and if yes, get image
 	humbleBundle := HumbleBundleStruct{
 		url:      "https://www.humblebundle.com/",
 		baseUrl:  "https://www.humblebundle.com/store/",
@@ -80,7 +81,7 @@ func (e HumbleBundleStruct) Load() error {
 				return nil
 			case tt == html.StartTagToken:
 				t := bodyStore.Token()
-				if t.Data != "script" {
+				if t.Data != "script" { // only <script> tag
 					continue
 				}
 				for _, a := range t.Attr {

cmd/dealsbot/api/steam.go

@@ -42,6 +42,7 @@ type steamApiBodyGame struct {
 		Type          string `json:"type"`
 		Name          string `json:"name"`
 		IsFree        bool   `json:"is_free"`
+		HeaderImage   string `json:"header_image"`
 		PriceOverview struct {
 			Currency         string `json:"currency"`
 			Initial          int    `json:"initial"`
@@ -95,7 +96,7 @@ func (e SteamStruct) Load() error {
 				return
 			case tt == html.StartTagToken:
 				t := bodyStore.Token()
-				if t.Data != "a" {
+				if t.Data != "a" { // only <a> tag
 					continue
 				}
 				for _, a := range t.Attr {
@@ -139,6 +140,9 @@ func (e SteamStruct) Load() error {
 			if game.Data.Type != "game" {
 				continue
 			}
+
+			image := game.Data.HeaderImage
+
 			id := fmt.Sprintf("%v%v", e.idPrefix, appID)
 			title := strings.TrimSpace(game.Data.Name)
 			url := fmt.Sprintf("%v%v", e.baseUrl, appID)
@@ -147,6 +151,7 @@ func (e SteamStruct) Load() error {
 				Id:    id,
 				Title: title,
 				Url:   url,
+				Image: image,
 			}
 		}
 	}

cmd/dealsbot/api/ubisoft.go

@@ -37,9 +37,10 @@ func NewUbsioftApi(logger *slog.Logger) UbisoftStruct {
 
 type ubisoftApiBody struct {
 	News []struct {
-		Type  string `json:"type"`
+		Type     string `json:"type"`
-		Title string `json:"title"`
+		Title    string `json:"title"`
-		Links []struct {
+		MediaUrl string `json:"mediaURL"`
+		Links    []struct {
 			Param string `json:"param"`
 		} `json:"links"`
 	} `json:"news"`
@@ -128,11 +129,13 @@ func (e UbisoftStruct) Load() error {
 
 		id := fmt.Sprintf("%v%v", e.idPrefix, idFromUrl[1])
 		url := news.Links[0].Param
+		image := news.MediaUrl
 
 		e.deals[id] = Deal{
 			Id:    id,
 			Title: title,
 			Url:   url,
+			Image: image,
 		}
 	}