moving vocation logic to separate function (#17)

to be able to sanitize the input

Author: tobiasehlert

src/TibiaHighscoresV3.go

@@ -106,31 +106,8 @@ func TibiaHighscoresV3(c *gin.Context) {
 		category = "experience"
 	}
 
-	// Sanitize of vocation value and assigning correct vocationid for request
-	var vocationid string
-	vocationid = "0"
-	if len(vocation) > 0 {
-		if strings.EqualFold(vocation, "none") {
-			vocationid = "1"
-			vocation = "none"
-		} else if strings.EqualFold(vocation, "knight") || strings.EqualFold(vocation, "knights") {
-			vocationid = "2"
-			vocation = "knights"
-		} else if strings.EqualFold(vocation, "paladin") || strings.EqualFold(vocation, "paladins") {
-			vocationid = "3"
-			vocation = "paladins"
-		} else if strings.EqualFold(vocation, "sorcerer") || strings.EqualFold(vocation, "sorcerers") {
-			vocationid = "4"
-			vocation = "sorcerers"
-		} else if strings.EqualFold(vocation, "druid") || strings.EqualFold(vocation, "druids") {
-			vocationid = "5"
-			vocation = "druids"
-		} else {
-			vocation = "all"
-		}
-	} else {
-		vocation = "all"
-	}
+	// Sanitize of vocation input
+	vocationName, vocationid := TibiaDataVocationValidator(vocation)
 
 	// Getting data with TibiadataHTMLDataCollectorV3
 	BoxContentHTML := TibiadataHTMLDataCollectorV3("https://www.tibia.com/community/?subtopic=highscores&world=" + TibiadataQueryEscapeStringV3(world) + "&category=" + TibiadataQueryEscapeStringV3(categoryid) + "&profession=" + TibiadataQueryEscapeStringV3(vocationid) + "&currentpage=400000000000000")
@@ -244,7 +221,7 @@ func TibiaHighscoresV3(c *gin.Context) {
 		Highscores{
 			World:         strings.Title(strings.ToLower(world)),
 			Category:      category,
-			Vocation:      vocation,
+			Vocation:      vocationName,
 			HighscoreAge:  HighscoreAge,
 			HighscoreList: HighscoreData,
 		},

src/TibiaSpellsOverviewV3.go

@@ -47,26 +47,19 @@ func TibiaSpellsOverviewV3(c *gin.Context) {
 		Information Information `json:"information"`
 	}
 
-	// Sanatize of vocation value
-	vocation = strings.ToLower(vocation)
-	if len(vocation) > 0 {
-		if strings.EqualFold(vocation, "knight") || strings.EqualFold(vocation, "knights") {
-			vocation = strings.Title("knight")
-		} else if strings.EqualFold(vocation, "paladin") || strings.EqualFold(vocation, "paladins") {
-			vocation = strings.Title("paladin")
-		} else if strings.EqualFold(vocation, "sorcerer") || strings.EqualFold(vocation, "sorcerers") {
-			vocation = strings.Title("sorcerer")
-		} else if strings.EqualFold(vocation, "druid") || strings.EqualFold(vocation, "druids") {
-			vocation = strings.Title("druid")
-		} else {
-			vocation = ""
-		}
+	// Sanitize of vocation input
+	vocationName, _ := TibiaDataVocationValidator(vocation)
+	if vocationName == "all" || vocationName == "none" {
+		vocationName = ""
 	} else {
-		vocation = ""
+		// removes the last letter (s) from the string (required for spells page)
+		vocationName = strings.TrimSuffix(vocationName, "s")
+		// setting string to first upper case
+		vocationName = strings.Title(vocationName)
 	}
 
 	// Getting data with TibiadataHTMLDataCollectorV3
-	BoxContentHTML := TibiadataHTMLDataCollectorV3("https://www.tibia.com/library/?subtopic=spells&vocation=" + TibiadataQueryEscapeStringV3(vocation))
+	BoxContentHTML := TibiadataHTMLDataCollectorV3("https://www.tibia.com/library/?subtopic=spells&vocation=" + TibiadataQueryEscapeStringV3(vocationName))
 
 	// Loading HTML data into ReaderHTML for goquery with NewReader
 	ReaderHTML, err := goquery.NewDocumentFromReader(strings.NewReader(BoxContentHTML))
@@ -143,15 +136,15 @@ func TibiaSpellsOverviewV3(c *gin.Context) {
 	})
 
 	// adding readable SpellsVocationFilter field
-	if vocation == "" {
-		vocation = "none"
+	if vocationName == "" {
+		vocationName = "all"
 	}
 
 	//
 	// Build the data-blob
 	jsonData := JSONData{
 		Spells{
-			SpellsVocationFilter: vocation,
+			SpellsVocationFilter: vocationName,
 			Spells:               SpellsData,
 		},
 		Information{

src/webserver.go

@@ -486,3 +486,33 @@ func getEnvAsInt(name string, defaultVal int) int {
 	return defaultVal
 }
 */
+
+// TibiaDataVocationValidator func - return valid vocation string and vocation id
+func TibiaDataVocationValidator(vocation string) (string, string) {
+	// defining return vars
+	var vocationid string
+
+	switch strings.ToLower(vocation) {
+	case "none":
+		vocationid = "1"
+		vocation = "none"
+	case "knight", "knights":
+		vocationid = "2"
+		vocation = "knights"
+	case "paladin", "paladins":
+		vocationid = "3"
+		vocation = "paladins"
+	case "sorcerer", "sorcerers":
+		vocationid = "4"
+		vocation = "sorcerers"
+	case "druid", "druids":
+		vocationid = "5"
+		vocation = "druids"
+	default:
+		vocationid = "0"
+		vocation = "all"
+	}
+
+	// returning vars
+	return vocation, vocationid
+}