renaming Tibiadata to TibiaData (#90)

Co-authored-by: Pedro Pessoa <pedro_santos_40@hotmail.com>

Author: tobiasehlert

.github/workflows/build.yml

@@ -75,6 +75,6 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
           build-args: |
-            TibiadataBuildBuilder=github
-            TibiadataBuildRelease=${{ fromJSON(steps.docker_meta.outputs.json).labels['org.opencontainers.image.version'] }}
-            TibiadataBuildCommit=${{ fromJSON(steps.docker_meta.outputs.json).labels['org.opencontainers.image.revision'] }}
+            TibiaDataBuildBuilder=github
+            TibiaDataBuildRelease=${{ fromJSON(steps.docker_meta.outputs.json).labels['org.opencontainers.image.version'] }}
+            TibiaDataBuildCommit=${{ fromJSON(steps.docker_meta.outputs.json).labels['org.opencontainers.image.revision'] }}

CHANGELOG.md

@@ -62,7 +62,7 @@ Head over to [tibiadata.com](https://tibiadata.com/2022/03/tibiadata-api-v3-rele
 * Cache new regex queries ([#66](https://github.com/TibiaData/tibiadata-api-go/pull/66) by [kamilon](https://github.com/kamilon))
 
 ### Fixed
-* Fix race condition with TibiadataRequestStruct ([#65](https://github.com/TibiaData/tibiadata-api-go/pull/65) by [kamilon](https://github.com/kamilon))
+* Fix race condition with TibiaDataRequestStruct ([#65](https://github.com/TibiaData/tibiadata-api-go/pull/65) by [kamilon](https://github.com/kamilon))
 * Bump docker/build-push-action from 2.7.0 to 2.8.0 ([#68](https://github.com/TibiaData/tibiadata-api-go/pull/68) by [dependabot](https://github.com/dependabot))
 
 ## [0.4.0] - 2022-01-12

Dockerfile

@@ -2,9 +2,9 @@
 FROM golang:1.17.7
 
 # get args
-ARG TibiadataBuildBuilder=dockerfile
-ARG TibiadataBuildRelease=-
-ARG TibiadataBuildCommit=-
+ARG TibiaDataBuildBuilder=dockerfile
+ARG TibiaDataBuildRelease=-
+ARG TibiaDataBuildCommit=-
 
 # create and set workingfolder
 WORKDIR /go/src/
@@ -19,7 +19,7 @@ RUN go mod download
 COPY src/ .
 
 # compile the program
-RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags="-w -s -X 'main.TibiadataBuildBuilder=${TibiadataBuildBuilder}' -X 'main.TibiadataBuildRelease=${TibiadataBuildRelease}' -X 'main.TibiadataBuildCommit=${TibiadataBuildCommit}'" -o app .
+RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags="-w -s -X 'main.TibiaDataBuildBuilder=${TibiaDataBuildBuilder}' -X 'main.TibiaDataBuildRelease=${TibiaDataBuildRelease}' -X 'main.TibiaDataBuildCommit=${TibiaDataBuildCommit}'" -o app .
 
 
 # get latest alpine container

src/HousesMapping.go

@@ -10,7 +10,7 @@ import (
 )
 
 var (
-	TibiadataHousesMapping HousesMapping
+	TibiaDataHousesMapping HousesMapping
 )
 
 type AssetsHouse struct {
@@ -35,7 +35,7 @@ func TibiaDataHousesMappingInitiator() {
 	// Set headers for all requests
 	client.SetHeaders(map[string]string{
 		"Content-Type": "application/json",
-		"User-Agent":   TibiadataUserAgent,
+		"User-Agent":   TibiaDataUserAgent,
 	})
 
 	// Enabling Content length value for all request
@@ -44,8 +44,8 @@ func TibiaDataHousesMappingInitiator() {
 	// Disable redirection of client (so we skip parsing maintenance page)
 	client.SetRedirectPolicy(resty.NoRedirectPolicy())
 
-	TibiadataAssetsURL := "https://assets.tibiadata.com/data.min.json"
-	res, err := client.R().Get(TibiadataAssetsURL)
+	TibiaDataAssetsURL := "https://assets.tibiadata.com/data.min.json"
+	res, err := client.R().Get(TibiaDataAssetsURL)
 
 	switch res.StatusCode() {
 	case http.StatusOK:
@@ -57,7 +57,7 @@ func TibiaDataHousesMappingInitiator() {
 			log.Println("[error] TibiaData API failed to parse content from assets.tibiadata.com/data.min.json")
 		} else {
 			// storing data so it's accessible from other places
-			TibiadataHousesMapping = data
+			TibiaDataHousesMapping = data
 		}
 
 	default:
@@ -67,7 +67,7 @@ func TibiaDataHousesMappingInitiator() {
 
 // TibiaDataHousesMapResolver func - used to return both town and type
 func TibiaDataHousesMapResolver(houseid int) (town string, housetype string) {
-	for _, value := range TibiadataHousesMapping.Houses {
+	for _, value := range TibiaDataHousesMapping.Houses {
 		if houseid == value.HouseID {
 			return value.Town, value.HouseType
 		}

src/TibiaCharactersCharacterV3.go

@@ -174,7 +174,7 @@ func TibiaCharactersCharacterV3Impl(BoxContentHTML string) CharacterResponse {
 					if strings.Contains(Tmp[0], ", will be deleted at") {
 						Tmp2 := strings.Split(Tmp[0], ", will be deleted at ")
 						CharacterInformationData.Name = Tmp2[0]
-						CharacterInformationData.DeletionDate = TibiadataDatetimeV3(strings.TrimSpace(Tmp2[1]))
+						CharacterInformationData.DeletionDate = TibiaDataDatetimeV3(strings.TrimSpace(Tmp2[1]))
 					}
 					if strings.Contains(RowData, localTradedString) {
 						CharacterInformationData.Traded = true
@@ -187,13 +187,13 @@ func TibiaCharactersCharacterV3Impl(BoxContentHTML string) CharacterResponse {
 				case "Title:":
 					subma1t := titleRegex.FindAllStringSubmatch(RowData, -1)
 					CharacterInformationData.Title = subma1t[0][1]
-					CharacterInformationData.UnlockedTitles = TibiadataStringToIntegerV3(subma1t[0][2])
+					CharacterInformationData.UnlockedTitles = TibiaDataStringToIntegerV3(subma1t[0][2])
 				case "Vocation:":
 					CharacterInformationData.Vocation = RowData
 				case "Level:":
-					CharacterInformationData.Level = TibiadataStringToIntegerV3(RowData)
+					CharacterInformationData.Level = TibiaDataStringToIntegerV3(RowData)
 				case "nobr", "Achievement Points:":
-					CharacterInformationData.AchievementPoints = TibiadataStringToIntegerV3(RowData)
+					CharacterInformationData.AchievementPoints = TibiaDataStringToIntegerV3(RowData)
 				case "World:":
 					CharacterInformationData.World = RowData
 				case "Former World:":
@@ -203,7 +203,7 @@ func TibiaCharactersCharacterV3Impl(BoxContentHTML string) CharacterResponse {
 				case "Account Status:":
 					CharacterInformationData.AccountStatus = RowData
 				case "Married To:":
-					CharacterInformationData.MarriedTo = TibiadataRemoveURLsV3(RowData)
+					CharacterInformationData.MarriedTo = TibiaDataRemoveURLsV3(RowData)
 				case "House:":
 					AnchorQuery := s.Find("a")
 					HouseName := AnchorQuery.Nodes[0].FirstChild.Data
@@ -217,8 +217,8 @@ func TibiaCharactersCharacterV3Impl(BoxContentHTML string) CharacterResponse {
 					CharacterInformationData.Houses = append(CharacterInformationData.Houses, Houses{
 						Name:    HouseName,
 						Town:    HouseTown,
-						Paid:    TibiadataDateV3(HousePaidUntil),
-						HouseID: TibiadataStringToIntegerV3(HouseId),
+						Paid:    TibiaDataDateV3(HousePaidUntil),
+						HouseID: TibiaDataStringToIntegerV3(HouseId),
 					})
 				case "Guild Membership:":
 					CharacterInformationData.Guild.Rank = RowData
@@ -227,7 +227,7 @@ func TibiaCharactersCharacterV3Impl(BoxContentHTML string) CharacterResponse {
 					CharacterInformationData.Guild.GuildName = TibiaDataSanitizeNbspSpaceString(RowNameQuery.Nodes[0].NextSibling.LastChild.LastChild.Data)
 				case "Last Login:":
 					if RowData != "never logged in" {
-						CharacterInformationData.LastLogin = TibiadataDatetimeV3(RowData)
+						CharacterInformationData.LastLogin = TibiaDataDatetimeV3(RowData)
 					}
 				case "Comment:":
 					node := RowNameQuery.Nodes[0].NextSibling.FirstChild
@@ -248,7 +248,7 @@ func TibiaCharactersCharacterV3Impl(BoxContentHTML string) CharacterResponse {
 				case "Loyalty Title:":
 					AccountInformationData.LoyaltyTitle = RowData
 				case "Created:":
-					AccountInformationData.Created = TibiadataDatetimeV3(RowData)
+					AccountInformationData.Created = TibiaDataDatetimeV3(RowData)
 				case "Position:":
 					TmpPosition := strings.Split(RowData, "<")
 					AccountInformationData.Position = strings.TrimSpace(TmpPosition[0])
@@ -266,7 +266,7 @@ func TibiaCharactersCharacterV3Impl(BoxContentHTML string) CharacterResponse {
 				}
 
 				// Removing line breaks
-				CharacterListHTML = TibiadataHTMLRemoveLinebreaksV3(CharacterListHTML)
+				CharacterListHTML = TibiaDataHTMLRemoveLinebreaksV3(CharacterListHTML)
 
 				// prevent failure of regex that parses account badges
 				if CharacterListHTML != "There are no account badges set to be displayed for this character." {
@@ -290,7 +290,7 @@ func TibiaCharactersCharacterV3Impl(BoxContentHTML string) CharacterResponse {
 				}
 
 				// Removing line breaks
-				CharacterListHTML = TibiadataHTMLRemoveLinebreaksV3(CharacterListHTML)
+				CharacterListHTML = TibiaDataHTMLRemoveLinebreaksV3(CharacterListHTML)
 
 				subma1a := accountAchievementsRegex.FindAllStringSubmatch(CharacterListHTML, -1)
 				if len(subma1a) > 0 {
@@ -317,7 +317,7 @@ func TibiaCharactersCharacterV3Impl(BoxContentHTML string) CharacterResponse {
 				}
 
 				// Removing line breaks
-				CharacterListHTML = TibiadataHTMLRemoveLinebreaksV3(CharacterListHTML)
+				CharacterListHTML = TibiaDataHTMLRemoveLinebreaksV3(CharacterListHTML)
 				CharacterListHTML = strings.ReplaceAll(CharacterListHTML, ".<br/>Assisted by", ". Assisted by")
 
 				// Regex to get data for deaths
@@ -386,8 +386,8 @@ func TibiaCharactersCharacterV3Impl(BoxContentHTML string) CharacterResponse {
 
 					// append deadentry to death list
 					DeathsData = append(DeathsData, Deaths{
-						Time:    TibiadataDatetimeV3(subma1[0][1]),
-						Level:   TibiadataStringToIntegerV3(subma1[0][3]),
+						Time:    TibiaDataDatetimeV3(subma1[0][1]),
+						Level:   TibiaDataStringToIntegerV3(subma1[0][3]),
 						Killers: DeathKillers,
 						Assists: DeathAssists,
 						Reason:  ReasonString,
@@ -404,7 +404,7 @@ func TibiaCharactersCharacterV3Impl(BoxContentHTML string) CharacterResponse {
 				}
 
 				// Removing line breaks
-				CharacterListHTML = TibiadataHTMLRemoveLinebreaksV3(CharacterListHTML)
+				CharacterListHTML = TibiaDataHTMLRemoveLinebreaksV3(CharacterListHTML)
 
 				subma1 := characterInfoRegex.FindAllStringSubmatch(CharacterListHTML, -1)
 
@@ -463,8 +463,8 @@ func TibiaCharactersCharacterV3Impl(BoxContentHTML string) CharacterResponse {
 			OtherCharactersData,
 		},
 		Information{
-			APIVersion: TibiadataAPIversion,
-			Timestamp:  TibiadataDatetimeV3(""),
+			APIVersion: TibiaDataAPIversion,
+			Timestamp:  TibiaDataDatetimeV3(""),
 		},
 	}
 }

src/TibiaCreaturesCreatureV3.go

@@ -96,7 +96,7 @@ func TibiaCreaturesCreatureV3Impl(race string, BoxContentHTML string) CreatureRe
 		// Regex to get data..
 		subma2 := CreatureHitpointsRegex.FindAllStringSubmatch(subma1[0][4], -1)
 		// Add data to vars
-		CreatureHitpoints = TibiadataStringToIntegerV3(subma2[0][1])
+		CreatureHitpoints = TibiaDataStringToIntegerV3(subma2[0][1])
 		CreatureBehaviour = subma2[0][2]
 		if !strings.Contains(subma1[0][4], "cannot be paralysed") {
 			CreatureBeParalysed = true
@@ -124,20 +124,20 @@ func TibiaCreaturesCreatureV3Impl(race string, BoxContentHTML string) CreatureRe
 			subma2402 := subma24[0][2]
 			if strings.Contains(subma2402, "convince these creatures but they cannot be") {
 				CreatureBeConvinced = true
-				CreatureConvincedMana = TibiadataStringToIntegerV3(subma24[0][1])
+				CreatureConvincedMana = TibiaDataStringToIntegerV3(subma24[0][1])
 			} else if strings.Contains(subma2402, "summon or convince these creatures") {
 				CreatureBeSummoned = true
-				CreatureSummonedMana = TibiadataStringToIntegerV3(subma24[0][1])
+				CreatureSummonedMana = TibiaDataStringToIntegerV3(subma24[0][1])
 				CreatureBeConvinced = true
-				CreatureConvincedMana = TibiadataStringToIntegerV3(subma24[0][1])
+				CreatureConvincedMana = TibiaDataStringToIntegerV3(subma24[0][1])
 			}
 		}
 
 		// Loot
 		// Regex to get loot information
 		subma3 := CreatureLootRegex.FindAllStringSubmatch(subma1[0][5], -1)
 		// Adding data to vars
-		CreatureExperiencePoints = TibiadataStringToIntegerV3(subma3[0][1])
+		CreatureExperiencePoints = TibiaDataStringToIntegerV3(subma3[0][1])
 		if subma3[0][2] != "nothing" {
 			CreatureIsLootable = true
 			CreatureLootListTmp := strings.Split(strings.Replace(strings.Replace(subma3[0][2], "items ", "", 1), " and sometimes other ", "", 1), ", ")
@@ -173,8 +173,8 @@ func TibiaCreaturesCreatureV3Impl(race string, BoxContentHTML string) CreatureRe
 			Featured:         CreatureIsBoosted,
 		},
 		Information{
-			APIVersion: TibiadataAPIversion,
-			Timestamp:  TibiadataDatetimeV3(""),
+			APIVersion: TibiaDataAPIversion,
+			Timestamp:  TibiaDataDatetimeV3(""),
 		},
 	}
 }

src/TibiaCreaturesOverviewV3.go

@@ -114,8 +114,8 @@ func TibiaCreaturesOverviewV3Impl(BoxContentHTML string) CreaturesOverviewRespon
 			Creatures: CreaturesData,
 		},
 		Information{
-			APIVersion: TibiadataAPIversion,
-			Timestamp:  TibiadataDatetimeV3(""),
+			APIVersion: TibiaDataAPIversion,
+			Timestamp:  TibiaDataDatetimeV3(""),
 		},
 	}
 }

src/TibiaDataUtils.go

@@ -16,8 +16,8 @@ import (
 	"golang.org/x/text/unicode/norm"
 )
 
-// TibiadataDatetimeV3 func
-func TibiadataDatetimeV3(date string) string {
+// TibiaDataDatetimeV3 func
+func TibiaDataDatetimeV3(date string) string {
 	//TODO: Normalization needs to happen above this layer
 	date = norm.NFKC.String(date)
 
@@ -52,15 +52,15 @@ func TibiadataDatetimeV3(date string) string {
 	return returnDate.UTC().Format(time.RFC3339)
 }
 
-// TibiadataHTMLRemoveLinebreaksV3 func
-func TibiadataHTMLRemoveLinebreaksV3(data string) string {
+// TibiaDataHTMLRemoveLinebreaksV3 func
+func TibiaDataHTMLRemoveLinebreaksV3(data string) string {
 	return strings.ReplaceAll(data, "\n", "")
 }
 
 var removeUrlRegex = regexp.MustCompile(`<a.*>(.*)<\/a>`)
 
-// TibiadataRemoveURLsV3 func
-func TibiadataRemoveURLsV3(data string) string {
+// TibiaDataRemoveURLsV3 func
+func TibiaDataRemoveURLsV3(data string) string {
 	// prepare return value
 	var returnData string
 
@@ -75,13 +75,13 @@ func TibiadataRemoveURLsV3(data string) string {
 	return returnData
 }
 
-// TibiadataStringWorldFormatToTitleV3 func
-func TibiadataStringWorldFormatToTitleV3(world string) string {
+// TibiaDataStringWorldFormatToTitleV3 func
+func TibiaDataStringWorldFormatToTitleV3(world string) string {
 	return strings.Title(strings.ToLower(world))
 }
 
-// TibiadataQueryEscapeStringV3 func - encode string to be correct formatted
-func TibiadataQueryEscapeStringV3(data string) string {
+// TibiaDataQueryEscapeStringV3 func - encode string to be correct formatted
+func TibiaDataQueryEscapeStringV3(data string) string {
 	// switching "+" to " "
 	data = strings.ReplaceAll(data, "+", " ")
 
@@ -92,8 +92,8 @@ func TibiadataQueryEscapeStringV3(data string) string {
 	return url.QueryEscape(data)
 }
 
-// TibiadataDateV3 func
-func TibiadataDateV3(date string) string {
+// TibiaDataDateV3 func
+func TibiaDataDateV3(date string) string {
 	// removing weird spacing and comma
 	date = TibiaDataSanitizeNbspSpaceString(strings.ReplaceAll(date, ",", ""))
 
@@ -120,11 +120,11 @@ func TibiadataDateV3(date string) string {
 	return tmpDate.UTC().Format("2006-01-02")
 }
 
-// TibiadataStringToIntegerV3 func
-func TibiadataStringToIntegerV3(data string) int {
+// TibiaDataStringToIntegerV3 func
+func TibiaDataStringToIntegerV3(data string) int {
 	returnData, err := strconv.Atoi(strings.ReplaceAll(data, ",", ""))
 	if err != nil {
-		log.Printf("[warning] TibiadataStringToIntegerV3: couldn't convert string into int. error: %s", err)
+		log.Printf("[warning] TibiaDataStringToIntegerV3: couldn't convert string into int. error: %s", err)
 	}
 
 	return returnData
@@ -224,7 +224,7 @@ func getEnvAsInt(name string, defaultVal int) int {
 
 // TibiaDataConvertValuesWithK func - convert price strings that contain k, kk or more to 3x0
 func TibiaDataConvertValuesWithK(data string) int {
-	return TibiadataStringToIntegerV3(strings.ReplaceAll(data, "k", "") + strings.Repeat("000", strings.Count(data, "k")))
+	return TibiaDataStringToIntegerV3(strings.ReplaceAll(data, "k", "") + strings.Repeat("000", strings.Count(data, "k")))
 }
 
 // TibiaDataVocationValidator func - return valid vocation string and vocation id
@@ -257,8 +257,8 @@ func TibiaDataVocationValidator(vocation string) (string, string) {
 	return vocation, vocationid
 }
 
-// TibiadataGetNewsCategory func - extract news category by newsicon
-func TibiadataGetNewsCategory(data string) string {
+// TibiaDataGetNewsCategory func - extract news category by newsicon
+func TibiaDataGetNewsCategory(data string) string {
 	switch {
 	case strings.Contains(data, "newsicon_cipsoft"):
 		return "cipsoft"
@@ -275,8 +275,8 @@ func TibiadataGetNewsCategory(data string) string {
 	}
 }
 
-// TibiadataGetNewsType func - extract news type
-func TibiadataGetNewsType(data string) string {
+// TibiaDataGetNewsType func - extract news type
+func TibiaDataGetNewsType(data string) string {
 	switch data {
 	case "News Ticker":
 		return "ticker"