Removing some code smell from SonarCloud (#10)

* defining local string used in functions
* fixing error message

Author: tobiasehlert

src/TibiaCharactersCharacterV3.go

@@ -14,6 +14,10 @@ import (
 // TibiaCharactersCharacterV3 func
 func TibiaCharactersCharacterV3(c *gin.Context) {
 
+	// local strings used in this function
+	var localDivQueryString = ".TableContentContainer tr"
+	var localTradedString = " (traded)"
+
 	// getting params from URL
 	character := c.Param("character")
 
@@ -196,7 +200,7 @@ func TibiaCharactersCharacterV3(c *gin.Context) {
 		if CharacterSection == "characterinformation" || CharacterSection == "accountinformation" {
 
 			// Running query over each tr in character content container
-			CharacterDivQuery.Find(".TableContentContainer tr").Each(func(index int, s *goquery.Selection) {
+			CharacterDivQuery.Find(localDivQueryString).Each(func(index int, s *goquery.Selection) {
 
 				// Storing HTML into CharacterTrHTML
 				CharacterTrHTML, err := s.Html()
@@ -223,9 +227,9 @@ func TibiaCharactersCharacterV3(c *gin.Context) {
 							CharacterInformationData.Name = Tmp2[0]
 							CharacterInformationData.DeletionDate = TibiadataDatetimeV3(strings.TrimSpace(Tmp2[1]))
 						}
-						if strings.Contains(subma1[0][2], "(traded)") {
+						if strings.Contains(subma1[0][2], localTradedString) {
 							CharacterInformationData.Traded = true
-							CharacterInformationData.Name = strings.Replace(CharacterInformationData.Name, " (traded)", "", -1)
+							CharacterInformationData.Name = strings.Replace(CharacterInformationData.Name, localTradedString, "", -1)
 						}
 					} else if subma1[0][1] == "Former Names" {
 						CharacterInformationData.FormerNames = strings.Split(subma1[0][2], ", ")
@@ -314,7 +318,7 @@ func TibiaCharactersCharacterV3(c *gin.Context) {
 
 		} else if CharacterSection == "accountachievements" {
 			// Running query over each tr in list
-			CharacterDivQuery.Find(".TableContentContainer tr").Each(func(index int, s *goquery.Selection) {
+			CharacterDivQuery.Find(localDivQueryString).Each(func(index int, s *goquery.Selection) {
 
 				// Storing HTML into CharacterListHTML
 				CharacterListHTML, err := s.Html()
@@ -348,7 +352,7 @@ func TibiaCharactersCharacterV3(c *gin.Context) {
 
 		} else if CharacterSection == "characterdeaths" {
 			// Running query over each tr in list
-			CharacterDivQuery.Find(".TableContentContainer tr").Each(func(index int, s *goquery.Selection) {
+			CharacterDivQuery.Find(localDivQueryString).Each(func(index int, s *goquery.Selection) {
 
 				// Storing HTML into CharacterListHTML
 				CharacterListHTML, err := s.Html()
@@ -442,7 +446,7 @@ func TibiaCharactersCharacterV3(c *gin.Context) {
 
 		} else if CharacterSection == "characters" {
 			// Running query over each tr in character list
-			CharacterDivQuery.Find(".TableContentContainer tr").Each(func(index int, s *goquery.Selection) {
+			CharacterDivQuery.Find(localDivQueryString).Each(func(index int, s *goquery.Selection) {
 
 				// Storing HTML into CharacterListHTML
 				CharacterListHTML, err := s.Html()
@@ -462,9 +466,9 @@ func TibiaCharactersCharacterV3(c *gin.Context) {
 					TmpCharacterName := subma1[0][1]
 
 					var TmpTraded bool
-					if strings.Contains(TmpCharacterName, " (traded)") {
+					if strings.Contains(TmpCharacterName, localTradedString) {
 						TmpTraded = true
-						TmpCharacterName = strings.ReplaceAll(TmpCharacterName, " (traded)", "")
+						TmpCharacterName = strings.ReplaceAll(TmpCharacterName, localTradedString, "")
 					}
 
 					// If this character is the main character of the account
@@ -526,14 +530,18 @@ func TibiaCharactersCharacterV3(c *gin.Context) {
 
 // TibiaDataParseKiller func - insert a html string and get the killers back
 func TibiaDataParseKiller(data string) (string, bool, bool, string) {
+
+	// local strings used in this function
+	var localTradedString = " (traded)"
+
 	var isPlayer, isTraded bool
 	var theSummon string
 
 	// check if killer is a traded player
-	if strings.Contains(data, " (traded)") {
+	if strings.Contains(data, localTradedString) {
 		isPlayer = true
 		isTraded = true
-		data = strings.ReplaceAll(data, " (traded)", "")
+		data = strings.ReplaceAll(data, localTradedString, "")
 	}
 
 	// check if killer is a player

src/TibiaCreaturesCreatureV3.go

@@ -12,6 +12,9 @@ import (
 // TibiaCreaturesCreatureV3 func
 func TibiaCreaturesCreatureV3(c *gin.Context) {
 
+	// local strings used in this function
+	var localDamageString = " damage"
+
 	// getting params from URL
 	race := c.Param("race")
 
@@ -93,19 +96,19 @@ func TibiaCreaturesCreatureV3(c *gin.Context) {
 		if strings.Contains(subma1[0][4], " are immune to ") {
 			regex21 := regexp.MustCompile(`.*are immune to (.*)`)
 			subma21 := regex21.FindAllStringSubmatch(subma1[0][4], -1)
-			CreatureImmuneToTmp := strings.Split(subma21[0][1], " damage")
+			CreatureImmuneToTmp := strings.Split(subma21[0][1], localDamageString)
 			CreatureImmuneTo = strings.Split(strings.Replace(CreatureImmuneToTmp[0], " and ", ", ", 1), ", ")
 		}
 		if strings.Contains(subma1[0][4], " are strong against ") {
 			regex22 := regexp.MustCompile(`.*are strong against (.*)`)
 			subma22 := regex22.FindAllStringSubmatch(subma1[0][4], -1)
-			CreatureStrongAgainstTmp := strings.Split(subma22[0][1], " damage")
+			CreatureStrongAgainstTmp := strings.Split(subma22[0][1], localDamageString)
 			CreatureStrongAgainst = strings.Split(strings.Replace(CreatureStrongAgainstTmp[0], " and ", ", ", 1), ", ")
 		}
 		if strings.Contains(subma1[0][4], " are weak against ") {
 			regex23 := regexp.MustCompile(`.*are weak against (.*)`)
 			subma23 := regex23.FindAllStringSubmatch(subma1[0][4], -1)
-			CreatureWeaknessAgainstTmp := strings.Split(subma23[0][1], " damage")
+			CreatureWeaknessAgainstTmp := strings.Split(subma23[0][1], localDamageString)
 			CreatureWeaknessAgainst = strings.Split(strings.Replace(CreatureWeaknessAgainstTmp[0], " and ", ", ", 1), ", ")
 		}
 		if strings.Contains(subma1[0][4], "It takes ") && strings.Contains(subma1[0][4], " mana to ") {

src/webserver.go

@@ -262,10 +262,7 @@ func TibiadataHTMLDataCollectorV3(TibiaURL string) string {
 
 		// Check if page is in maintenance mode
 		if res.StatusCode() == 302 {
-			log.Printf("[info] TibiadataHTMLDataCollectorV3 (URL: %s): Page tibia.com returns 302, probably maintenance mode enabled. ", TibiaURL)
-
-			// TODO
-			// do response with maintenance mode..
+			log.Printf("[info] TibiadataHTMLDataCollectorV3 (URL: %s): Page tibia.com returns 302, probably maintenance mode enabled?", TibiaURL)
 		}
 	}