adjusting parsing of fansite page (#125)

updating fansite_test
updating fansite testdata

Author: tobiasehlert

src/TibiaFansitesV3.go

@@ -57,7 +57,7 @@ type FansitesResponse struct {
 var (
 	FansiteInformationRegex = regexp.MustCompile(`<td><a href="(.*)" target.*img .*src="(.*)" alt="(.*)"\/><\/a>.*<a href=".*">(.*)<\/a><\/td><td.*top;">(.*)<\/td><td.*top;">(.*)<\/td><td.*top;">(.*)<\/td><td.*<ul><li>(.*)<\/li><\/ul><\/td><td.*top;">(.*)<\/td>`)
 	FansiteImgTagRegex      = regexp.MustCompile(`<img[^>]+\bsrc="([^"]+)"`)
-	FansiteLanguagesRegex   = regexp.MustCompile("iti__flag.iti__(..)")
+	FansiteLanguagesRegex   = regexp.MustCompile(`id="Language_([a-z]{2})`)
 	FansiteAnchorRegex      = regexp.MustCompile(`.*src="(.*)" alt=".*`)
 )
 
@@ -141,7 +141,7 @@ func TibiaFansitesV3Impl(BoxContentHTML string) FansitesResponse {
 				found := FansiteLanguagesRegex.FindAllString(subma1[0][7], -1)
 				FansiteLanguagesData := make([]string, len(found))
 				for i := range FansiteLanguagesData {
-					FansiteLanguagesData[i] = strings.ReplaceAll(found[i], "iti__flag iti__", "")
+					FansiteLanguagesData[i] = strings.ReplaceAll(found[i], "id=\"Language_", "")
 				}
 
 				// Specials

src/TibiaFansitesV3_test.go

@@ -17,11 +17,11 @@ func TestFansites(t *testing.T) {
 	fansitesJson := TibiaFansitesV3Impl(string(data))
 	assert := assert.New(t)
 
-	assert.Equal(17, len(fansitesJson.Fansites.PromotedFansites))
+	assert.Equal(18, len(fansitesJson.Fansites.PromotedFansites))
 
-	assert.Equal(22, len(fansitesJson.Fansites.SupportedFansites))
+	assert.Equal(20, len(fansitesJson.Fansites.SupportedFansites))
 
-	tibiaDataFansite := fansitesJson.Fansites.SupportedFansites[6]
+	tibiaDataFansite := fansitesJson.Fansites.SupportedFansites[5]
 	assert.Equal("TibiaData.com", tibiaDataFansite.Name)
 	assert.Equal("https://static.tibia.com/images/community/fansitelogos/TibiaData.com.gif", tibiaDataFansite.LogoURL)
 	assert.Equal("https://tibiadata.com", tibiaDataFansite.Homepage)
@@ -30,23 +30,23 @@ func TestFansites(t *testing.T) {
 	assert.False(tibiaDataFansite.ContentType.Texts)
 	assert.True(tibiaDataFansite.ContentType.Tools)
 	assert.False(tibiaDataFansite.ContentType.Wiki)
-	assert.False(tibiaDataFansite.SocialMedia.Discord)
-	assert.False(tibiaDataFansite.SocialMedia.Facebook)
+	assert.True(tibiaDataFansite.SocialMedia.Discord)
+	assert.True(tibiaDataFansite.SocialMedia.Facebook)
 	assert.False(tibiaDataFansite.SocialMedia.Instagram)
 	assert.False(tibiaDataFansite.SocialMedia.Reddit)
 	assert.False(tibiaDataFansite.SocialMedia.Twitch)
-	assert.False(tibiaDataFansite.SocialMedia.Twitter)
+	assert.True(tibiaDataFansite.SocialMedia.Twitter)
 	assert.False(tibiaDataFansite.SocialMedia.Youtube)
 	assert.Equal(1, len(tibiaDataFansite.Languages))
-	assert.Equal("us", tibiaDataFansite.Languages[0])
+	assert.Equal("en", tibiaDataFansite.Languages[0])
 	assert.Equal(3, len(tibiaDataFansite.Specials))
 	assert.Equal("API for Tibia data in JSON.", tibiaDataFansite.Specials[0])
 	assert.Equal("Discord server.", tibiaDataFansite.Specials[1])
 	assert.Equal("GitHub participant.", tibiaDataFansite.Specials[2])
 	assert.False(tibiaDataFansite.FansiteItem)
 	assert.Equal("", tibiaDataFansite.FansiteItemURL)
 
-	tibiaGalleryFansite := fansitesJson.Fansites.SupportedFansites[9]
+	tibiaGalleryFansite := fansitesJson.Fansites.SupportedFansites[8]
 	assert.Equal("TibiaGallery.com", tibiaGalleryFansite.Name)
 	assert.Equal("https://static.tibia.com/images/community/fansitelogos/TibiaGallery.com.gif", tibiaGalleryFansite.LogoURL)
 	assert.Equal("https://tibiagallery.com/", tibiaGalleryFansite.Homepage)
@@ -63,14 +63,14 @@ func TestFansites(t *testing.T) {
 	assert.False(tibiaGalleryFansite.SocialMedia.Twitter)
 	assert.False(tibiaGalleryFansite.SocialMedia.Youtube)
 	assert.Equal(9, len(tibiaGalleryFansite.Languages))
-	assert.Equal("br", tibiaGalleryFansite.Languages[0])
-	assert.Equal("pl", tibiaGalleryFansite.Languages[1])
-	assert.Equal("mx", tibiaGalleryFansite.Languages[2])
-	assert.Equal("us", tibiaGalleryFansite.Languages[3])
-	assert.Equal("se", tibiaGalleryFansite.Languages[4])
-	assert.Equal("de", tibiaGalleryFansite.Languages[5])
-	assert.Equal("fi", tibiaGalleryFansite.Languages[6])
-	assert.Equal("fr", tibiaGalleryFansite.Languages[7])
+	assert.Equal("de", tibiaGalleryFansite.Languages[0])
+	assert.Equal("en", tibiaGalleryFansite.Languages[1])
+	assert.Equal("es", tibiaGalleryFansite.Languages[2])
+	assert.Equal("fi", tibiaGalleryFansite.Languages[3])
+	assert.Equal("fr", tibiaGalleryFansite.Languages[4])
+	assert.Equal("pl", tibiaGalleryFansite.Languages[5])
+	assert.Equal("pt", tibiaGalleryFansite.Languages[6])
+	assert.Equal("sv", tibiaGalleryFansite.Languages[7])
 	assert.Equal("tr", tibiaGalleryFansite.Languages[8])
 	assert.Equal(1, len(tibiaGalleryFansite.Specials))
 	assert.Equal("Upload, browse, like and share pictures.", tibiaGalleryFansite.Specials[0])