add back missing commits from rebase

Author: phenpessoa

src/HighscoreCategory.go

@@ -153,7 +153,7 @@ func TibiaCharactersCharacterV3Impl(BoxContentHTML string) (*CharacterResponse,
 	// Loading HTML data into ReaderHTML for goquery with NewReader
 	ReaderHTML, err := goquery.NewDocumentFromReader(strings.NewReader(BoxContentHTML))
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("TibiaCharactersCharacterV3Impl failed at  goquery.NewDocumentFromReader, err: %s", err)
 	}
 
 	// Running query on every .TableContainer
@@ -276,7 +276,7 @@ func TibiaCharactersCharacterV3Impl(BoxContentHTML string) (*CharacterResponse,
 				// Storing HTML into CharacterListHTML
 				CharacterListHTML, err := s.Html()
 				if err != nil {
-					insideError = fmt.Errorf("[error] TibiaCharactersCharacterV3Impl failed on s.Html() inside Account Badges, err: %s", err)
+					insideError = fmt.Errorf("[error] TibiaCharactersCharacterV3Impl failed at s.Html() inside Account Badges, err: %s", err)
 					return false
 				}
 
@@ -302,7 +302,7 @@ func TibiaCharactersCharacterV3Impl(BoxContentHTML string) (*CharacterResponse,
 				// Storing HTML into CharacterListHTML
 				CharacterListHTML, err := s.Html()
 				if err != nil {
-					insideError = fmt.Errorf("[error] TibiaCharactersCharacterV3Impl failed on s.Html() inside Account Achievements, err: %s", err)
+					insideError = fmt.Errorf("[error] TibiaCharactersCharacterV3Impl failed at s.Html() inside Account Achievements, err: %s", err)
 					return false
 				}
 
@@ -332,7 +332,7 @@ func TibiaCharactersCharacterV3Impl(BoxContentHTML string) (*CharacterResponse,
 				// Storing HTML into CharacterListHTML
 				CharacterListHTML, err := s.Html()
 				if err != nil {
-					insideError = fmt.Errorf("[error] TibiaCharactersCharacterV3Impl failed on s.Html() inside Character Deaths, err: %s", err)
+					insideError = fmt.Errorf("[error] TibiaCharactersCharacterV3Impl failed at s.Html() inside Character Deaths, err: %s", err)
 					return false
 				}
 
@@ -422,7 +422,7 @@ func TibiaCharactersCharacterV3Impl(BoxContentHTML string) (*CharacterResponse,
 				// Storing HTML into CharacterListHTML
 				CharacterListHTML, err := s.Html()
 				if err != nil {
-					insideError = fmt.Errorf("[error] TibiaCharactersCharacterV3Impl failed on s.Html() inside Characters, err: %s", err)
+					insideError = fmt.Errorf("[error] TibiaCharactersCharacterV3Impl failed at s.Html() inside Characters, err: %s", err)
 					return false
 				}
 

src/HighscoreCategory_test.go

@@ -1,6 +1,8 @@
 package main
 
 import (
+	"fmt"
+	"log"
 	"net/http"
 	"regexp"
 	"strings"
@@ -55,13 +57,13 @@ func TibiaCreaturesCreatureV3Impl(race string, BoxContentHTML string) (*Creature
 	// Loading HTML data into ReaderHTML for goquery with NewReader
 	ReaderHTML, err := goquery.NewDocumentFromReader(strings.NewReader(BoxContentHTML))
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("[error] TibiaCreaturesCreatureV3Imp failed at goquery.NewDocumentFromReader, error: %s", err)
 	}
 
 	// Getting data
 	InnerTableContainerTMP1, err := ReaderHTML.Find(".BoxContent div").First().NextAll().Html()
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("[error] TibiaCreaturesCreatureV3Imp failed at ReaderHTML.Find, error: %s", err)
 	}
 
 	// Regex to get data
@@ -149,6 +151,7 @@ func TibiaCreaturesCreatureV3Impl(race string, BoxContentHTML string) (*Creature
 			}
 		}
 	} else {
+		log.Printf("[warning] TibiaCreaturesCreatureV3Impl called on invalid creature")
 		return nil, validation.ErrorCreatureNotFound
 	}
 

src/TibiaCharactersCharacterV3.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"net/http"
 	"regexp"
 	"strings"
@@ -43,13 +44,13 @@ func TibiaCreaturesOverviewV3Impl(BoxContentHTML string) (*CreaturesOverviewResp
 	// Loading HTML data into ReaderHTML for goquery with NewReader
 	ReaderHTML, err := goquery.NewDocumentFromReader(strings.NewReader(BoxContentHTML))
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("[error] TibiaCreaturesOverviewV3Impl failed at goquery.NewDocumentFromReader, err: %s", err)
 	}
 
 	// Getting data from div.InnerTableContainer and then first p
 	InnerTableContainerTMPB, err := ReaderHTML.Find(".InnerTableContainer p").First().Html()
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("[error] TibiaCreaturesOverviewV3Impl failed at ReaderHTML.Find, err: %s", err)
 	}
 
 	// Regex to get data for name and race param for boosted creature
@@ -78,12 +79,12 @@ func TibiaCreaturesOverviewV3Impl(BoxContentHTML string) (*CreaturesOverviewResp
 	)
 
 	// Running query over each div
-	ReaderHTML.Find(".BoxContent div div").Each(func(index int, s *goquery.Selection) {
+	ReaderHTML.Find(".BoxContent div div").EachWithBreak(func(index int, s *goquery.Selection) bool {
 		// Storing HTML into CreatureDivHTML
 		CreatureDivHTML, err := s.Html()
 		if err != nil {
-			insideError = err
-			return
+			insideError = fmt.Errorf("[error] TibiaCreaturesOverviewV3Impl failed at CreatureDivHTML, err := s.Html(), err: %s", err)
+			return false
 		}
 
 		// Regex to get data for name, race and img src param for creature
@@ -105,6 +106,8 @@ func TibiaCreaturesOverviewV3Impl(BoxContentHTML string) (*CreaturesOverviewResp
 				Featured: FeaturedRace,
 			})
 		}
+
+		return true
 	})
 
 	if insideError != nil {

src/TibiaCreaturesCreatureV3.go

@@ -176,6 +176,11 @@ func TibiaDataSanitizeNbspSpaceString(data string) string {
 	return strings.ReplaceAll(data, "\u00A0", " ")
 }
 
+// TibiaDataSanitize0026String replaces \u0026#39; with '
+func TibiaDataSanitize0026String(data string) string {
+	return strings.ReplaceAll(data, "\u0026#39;", "'")
+}
+
 // isEnvExist func - check if environment var is set
 func isEnvExist(key string) (ok bool) {
 	_, ok = os.LookupEnv(key)

src/TibiaCreaturesOverviewV3.go

@@ -71,3 +71,90 @@ func TestTibiaDataGetNewsType(t *testing.T) {
 	assert.Equal("news", TibiaDataGetNewsType("News"))
 	assert.Equal("unknown", TibiaDataGetNewsType("TibiaData"))
 }
+
+func TestHTMLLineBreakRemover(t *testing.T) {
+	const str = "a\nb\nc\nd\ne\nf\ng\nh\n"
+
+	sanitizedStr := TibiaDataHTMLRemoveLinebreaksV3(str)
+	assert.Equal(t, sanitizedStr, "abcdefgh")
+}
+
+func TestURLsRemover(t *testing.T) {
+	const str = `<a href="https://www.tibia.com/community/?subtopic=characters&amp;name=Bobeek">Bobeek</a>`
+
+	sanitizedStr := TibiaDataRemoveURLsV3(str)
+	assert.Equal(t, sanitizedStr, "Bobeek")
+}
+
+func TestWorldFormater(t *testing.T) {
+	const str = "hEsThDIáÛõ"
+
+	sanitizedStr := TibiaDataStringWorldFormatToTitleV3(str)
+	assert.Equal(t, sanitizedStr, "Hesthdiáûõ")
+}
+
+func TestEscaper(t *testing.T) {
+	const (
+		strOne   = "god durin"
+		strTwo   = "god+durin"
+		strThree = "gód"
+	)
+
+	sanitizedStrOne := TibiaDataQueryEscapeStringV3(strOne)
+	sanitizedStrTwo := TibiaDataQueryEscapeStringV3(strTwo)
+	sanitizedStrThree := TibiaDataQueryEscapeStringV3(strThree)
+
+	assert := assert.New(t)
+	assert.Equal(sanitizedStrOne, "god+durin")
+	assert.Equal(sanitizedStrTwo, "god+durin")
+	assert.Equal(sanitizedStrThree, "g%F3d")
+}
+
+func TestDateParser(t *testing.T) {
+	const str = "Mar 09 2022"
+
+	sanitizedString := TibiaDataDateV3(str)
+	assert.Equal(t, sanitizedString, "2022-03-09")
+}
+
+func TestStringToInt(t *testing.T) {
+	const str = "1"
+
+	convertedStr := TibiaDataStringToIntegerV3(str)
+	assert.Equal(t, 1, convertedStr)
+}
+
+func TestHTMLRemover(t *testing.T) {
+	const str = `<div id="DeactivationContainer" onclick="ActivateWebsiteFrame();$('.LightBoxContentToHide').css('display', 'none');">abc</div>`
+
+	sanitizedString := RemoveHtmlTag(str)
+	assert.Equal(t, sanitizedString, "abc")
+}
+
+func TestFake(t *testing.T) {
+	assert := assert.New(t)
+	const str = "&lt;"
+
+	htmlString := TibiaDataSanitizeEscapedString(str)
+	assert.Equal(htmlString, "<")
+
+	const strTwo = `"`
+
+	doubleString := TibiaDataSanitizeDoubleQuoteString(strTwo)
+	assert.Equal(doubleString, "'")
+
+	const strThree = "\u00A0"
+
+	nbspString := TibiaDataSanitizeNbspSpaceString(strThree)
+	assert.Equal(nbspString, " ")
+
+	const strFour = "\u0026#39;"
+
+	string0026 := TibiaDataSanitize0026String(strFour)
+	assert.Equal(string0026, "'")
+
+	const strFive = "1kk"
+
+	kkInt := TibiaDataConvertValuesWithK(strFive)
+	assert.Equal(kkInt, 1000000)
+}