Merge branch 'release/1.0.4'

ogame.go

@@ -1684,7 +1684,16 @@ func extractGalaxyInfos(pageHTML, botPlayerName string, botPlayerID, botPlayerRa
 
 			moonID, _ := strconv.Atoi(s.Find("td.moon").AttrOr("data-moon-id", ""))
 			moonSize, _ := strconv.Atoi(strings.Split(s.Find("td.moon span#moonsize").Text(), " ")[0])
-			moonActivity, _ := strconv.Atoi(strings.TrimSpace(s.Find("td.moon div.activity").Text()))
+			moonActivity := 0
+			moonDiv := s.Find("td.moon div.activity")
+			if moonDiv != nil {
+				moonDivClass := moonDiv.AttrOr("class", "")
+				if strings.Contains(moonDivClass, "minute15") {
+					moonActivity = 15
+				} else if strings.Contains(moonDivClass, "showMinutes") {
+					moonActivity, _ = strconv.Atoi(strings.TrimSpace(moonDiv.Text()))
+				}
+			}
 			if moonID > 0 {
 				planetInfos.Moon = new(MoonInfos)
 				planetInfos.Moon.ID = moonID

ogame_test.go

@@ -171,6 +171,15 @@ func TestExtractGalaxyInfosMoonNoActivity(t *testing.T) {
 	assert.Equal(t, 0, infos[0].Moon.Activity)
 }
 
+func TestExtractGalaxyInfosMoonActivity15(t *testing.T) {
+	pageHTMLBytes, _ := ioutil.ReadFile("samples/galaxy_moon_activity_unprecise.html")
+	infos, _ := extractGalaxyInfos(string(pageHTMLBytes), "Commodore Nomade", 123, 456)
+	assert.Equal(t, 8, len(infos))
+	assert.Equal(t, 33730993, infos[5].Moon.ID)
+	assert.Equal(t, 8944, infos[5].Moon.Diameter)
+	assert.Equal(t, 15, infos[5].Moon.Activity)
+}
+
 func TestExtractUserInfos(t *testing.T) {
 	pageHTMLBytes, _ := ioutil.ReadFile("samples/overview_inactive.html")
 	infos, _ := extractUserInfos(string(pageHTMLBytes), "en")