Merge branch 'release/42.4.3'

alaingilbert · Sep 5, 2020 · df3181e · df3181e
2 parents 74f08f6 + 2ff70ef
commit df3181e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/extracts_v71.go b/extracts_v71.go
@@ -625,7 +625,7 @@ func extractHighscoreFromDocV71(doc *goquery.Document) (out Highscore, err error
 
 func extractAllResourcesV71(pageHTML []byte) (out map[CelestialID]Resources, err error) {
 	out = make(map[CelestialID]Resources)
-	m := regexp.MustCompile(`var planetResources=([^;]+);`).FindSubmatch(pageHTML)
+	m := regexp.MustCompile(`var planetResources\s?=\s?([^;]+);`).FindSubmatch(pageHTML)
 	if len(m) != 2 {
 		return out, errors.New("failed to get resources json")
 	}

diff --git a/ogame.go b/ogame.go
@@ -2429,7 +2429,8 @@ func (b *OGame) highscore(category, typ, page int64) (out Highscore, err error)
 
 func (b *OGame) getAllResources() (map[CelestialID]Resources, error) {
 	vals := url.Values{
-		"page": {"traderOverview"},
+		"page":      {"ajax"},
+		"component": {"traderauctioneer"},
 	}
 	payload := url.Values{
 		"show": {"auctioneer"},