fix encoding of apostrophes in multiple places (#106)

change TibiaDataSanitizeNbspSpaceString to TibiaDataSanitizeStrings
running TibiaDataSanitizeEscapedString in TibiaDataSanitizeStrings
fix #103

Author: tobiasehlert

src/TibiaCharactersCharacterV3.go

@@ -167,7 +167,7 @@ func TibiaCharactersCharacterV3Impl(BoxContentHTML string) CharacterResponse {
 				RowName := RowNameQuery.Nodes[0].FirstChild.Data
 				RowData := RowNameQuery.Nodes[0].NextSibling.FirstChild.Data
 
-				switch TibiaDataSanitizeNbspSpaceString(RowName) {
+				switch TibiaDataSanitizeStrings(RowName) {
 				case "Name:":
 					Tmp := strings.Split(RowData, "<")
 					CharacterInformationData.Name = strings.TrimSpace(Tmp[0])
@@ -224,7 +224,7 @@ func TibiaCharactersCharacterV3Impl(BoxContentHTML string) CharacterResponse {
 					CharacterInformationData.Guild.Rank = RowData
 
 					//TODO: I don't understand why the unicode nbsp is there...
-					CharacterInformationData.Guild.GuildName = TibiaDataSanitizeNbspSpaceString(RowNameQuery.Nodes[0].NextSibling.LastChild.LastChild.Data)
+					CharacterInformationData.Guild.GuildName = TibiaDataSanitizeStrings(RowNameQuery.Nodes[0].NextSibling.LastChild.LastChild.Data)
 				case "Last Login:":
 					if RowData != "never logged in" {
 						CharacterInformationData.LastLogin = TibiaDataDatetimeV3(RowData)
@@ -330,8 +330,8 @@ func TibiaCharactersCharacterV3Impl(BoxContentHTML string) CharacterResponse {
 					DeathKillers := []Killers{}
 					DeathAssists := []Killers{}
 
-					// store for reply later on.. and replacing \u00A0 with normal space
-					ReasonString := TibiaDataSanitizeNbspSpaceString(RemoveHtmlTag(subma1[0][2] + " at Level " + subma1[0][3] + " by " + subma1[0][4] + "."))
+					// store for reply later on.. and sanitizing string
+					ReasonString := TibiaDataSanitizeStrings(RemoveHtmlTag(subma1[0][2] + " at Level " + subma1[0][3] + " by " + subma1[0][4] + "."))
 
 					// if kill is with assist..
 					if strings.Contains(subma1[0][4], ". Assisted by ") {
@@ -441,7 +441,7 @@ func TibiaCharactersCharacterV3Impl(BoxContentHTML string) CharacterResponse {
 
 					// Create the character and append it to the other characters list
 					OtherCharactersData = append(OtherCharactersData, OtherCharacters{
-						Name:    TmpCharacterName,
+						Name:    TibiaDataSanitizeStrings(TmpCharacterName),
 						World:   subma1[0][2],
 						Status:  TmpStatus,
 						Deleted: TmpDeleted,
@@ -501,8 +501,8 @@ func TibiaDataParseKiller(data string) (string, bool, bool, string) {
 		data = rs[0][2]
 	}
 
-	// replacing \u00A0 with normal space
-	data = TibiaDataSanitizeNbspSpaceString(data)
+	// sanitizing string
+	data = TibiaDataSanitizeStrings(data)
 
 	return data, isPlayer, isTraded, theSummon
 }

src/TibiaDataUtils.go

@@ -95,7 +95,7 @@ func TibiaDataQueryEscapeStringV3(data string) string {
 // TibiaDataDateV3 func
 func TibiaDataDateV3(date string) string {
 	// removing weird spacing and comma
-	date = TibiaDataSanitizeNbspSpaceString(strings.ReplaceAll(date, ",", ""))
+	date = TibiaDataSanitizeStrings(strings.ReplaceAll(date, ",", ""))
 
 	// var time parser
 	var tmpDate time.Time
@@ -169,9 +169,14 @@ func TibiaDataSanitizeDoubleQuoteString(data string) string {
 	return strings.ReplaceAll(data, "\"", "'")
 }
 
-// TibiaDataSanitizeNbspSpaceString func - replaces weird \u00A0 string to real space
-func TibiaDataSanitizeNbspSpaceString(data string) string {
-	return strings.ReplaceAll(data, "\u00A0", " ")
+// TibiaDataSanitizeStrings func - replacing various encoded strings to pure html
+func TibiaDataSanitizeStrings(data string) string {
+	// replaces weird \u00A0 string to real space
+	data = strings.ReplaceAll(data, "\u00A0", " ")
+	// replaces weird \u0026 string to amp (&)
+	data = strings.ReplaceAll(data, "\u0026", "&")
+	// returning string unescaped
+	return TibiaDataSanitizeEscapedString(data)
 }
 
 // isEnvExist func - check if environment var is set

src/TibiaGuildsGuildV3.go

@@ -213,7 +213,7 @@ func TibiaGuildsGuildV3Impl(guild string, BoxContentHTML string) GuildResponse {
 			}
 
 			MembersData = append(MembersData, GuildMember{
-				Name:     TibiaDataSanitizeNbspSpaceString(subma1[0][2]),
+				Name:     TibiaDataSanitizeStrings(subma1[0][2]),
 				Title:    MembersTitle,
 				Rank:     MembersRank,
 				Vocation: subma1[0][4],
@@ -228,7 +228,7 @@ func TibiaGuildsGuildV3Impl(guild string, BoxContentHTML string) GuildResponse {
 			if len(subma2) > 0 {
 				MembersCountInvited++
 				InvitedData = append(InvitedData, InvitedGuildMember{
-					Name: subma2[0][1],
+					Name: TibiaDataSanitizeStrings(subma2[0][1]),
 					Date: subma2[0][2],
 				})
 			}

src/TibiaHousesHouseV3.go

@@ -104,7 +104,7 @@ func TibiaHousesHouseV3Impl(houseid string, BoxContentHTML string) HouseResponse
 		HouseData.Size = TibiaDataStringToIntegerV3(subma1[0][5])
 		HouseData.Rent = TibiaDataConvertValuesWithK(subma1[0][6] + subma1[0][7])
 
-		HouseData.Status.Original = strings.TrimSpace(TibiaDataSanitizeNbspSpaceString(TibiaDataSanitizeEscapedString(RemoveHtmlTag(subma1[0][9]))))
+		HouseData.Status.Original = strings.TrimSpace(TibiaDataSanitizeStrings(TibiaDataSanitizeEscapedString(RemoveHtmlTag(subma1[0][9]))))
 
 		switch {
 		case strings.Contains(HouseData.Status.Original, "has been rented by"):
@@ -153,7 +153,7 @@ func TibiaHousesHouseV3Impl(houseid string, BoxContentHTML string) HouseResponse
 				// storing values from regex
 				HouseData.Status.Auction.AuctionEnd = TibiaDataDatetimeV3(subma2[0][3])
 				HouseData.Status.Auction.CurrentBid = TibiaDataStringToIntegerV3(subma2[0][4])
-				HouseData.Status.Auction.CurrentBidder = TibiaDataSanitizeNbspSpaceString(subma2[0][5])
+				HouseData.Status.Auction.CurrentBidder = TibiaDataSanitizeStrings(subma2[0][5])
 				if subma2[0][2] == "will end" {
 					HouseData.Status.Auction.AuctionOngoing = true
 				}

src/TibiaHousesOverviewV3.go

@@ -89,7 +89,7 @@ func TibiaHousesOverviewV3Impl(c *gin.Context, world string, town string, htmlDa
 
 			// Removing linebreaks from HTML
 			HousesDivHTML = TibiaDataHTMLRemoveLinebreaksV3(HousesDivHTML)
-			HousesDivHTML = TibiaDataSanitizeNbspSpaceString(HousesDivHTML)
+			HousesDivHTML = TibiaDataSanitizeStrings(HousesDivHTML)
 
 			subma1 := houseOverviewDataRegex.FindAllStringSubmatch(HousesDivHTML, -1)
 

src/TibiaNewslistV3.go

@@ -45,7 +45,7 @@ func TibiaNewslistV3Impl(days int, BoxContentHTML string) NewsListResponse {
 
 		// getting type from headline
 		NewsType := s.Nodes[0].FirstChild.NextSibling.FirstChild.NextSibling.NextSibling.FirstChild.Data
-		OneNews.Type = TibiaDataGetNewsType(TibiaDataSanitizeNbspSpaceString(NewsType))
+		OneNews.Type = TibiaDataGetNewsType(TibiaDataSanitizeStrings(NewsType))
 
 		// getting date from headline
 		OneNews.Date = TibiaDataDateV3(s.Nodes[0].FirstChild.NextSibling.FirstChild.Data)

src/TibiaWorldsWorldV3.go

@@ -181,9 +181,9 @@ func TibiaWorldsWorldV3Impl(world string, BoxContentHTML string) WorldResponse {
 		if len(subma1) > 0 {
 
 			WorldsOnlinePlayers = append(WorldsOnlinePlayers, OnlinePlayers{
-				Name:     TibiaDataSanitizeNbspSpaceString(subma1[0][1]),
+				Name:     TibiaDataSanitizeStrings(subma1[0][1]),
 				Level:    TibiaDataStringToIntegerV3(subma1[0][2]),
-				Vocation: TibiaDataSanitizeNbspSpaceString(subma1[0][3]),
+				Vocation: TibiaDataSanitizeStrings(subma1[0][3]),
 			})
 		}
 	})