Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# TibiaData API in Golang

[![GitHub CI](https://img.shields.io/github/actions/workflow/status/tibiadata/tibiadata-api-go/build.yml?branch=main&logo=github)](https://github.com/tibiadata/tibiadata-api-go/actions/workflows/build.yml)
[![Codecov](https://codecov.io/gh/TibiaData/tibiadata-api-go/branch/main/graph/badge.svg?token=PSBNLBI10C)](https://codecov.io/gh/TibiaData/tibiadata-api-go)
[![Codecov](https://codecov.io/gh/tibiadata/tibiadata-api-go/branch/main/graph/badge.svg?token=PSBNLBI10C)](https://codecov.io/gh/tibiadata/tibiadata-api-go)
[![GitHub go.mod version](https://img.shields.io/github/go-mod/go-version/tibiadata/tibiadata-api-go?logo=go)](https://github.com/tibiadata/tibiadata-api-go/blob/main/go.mod)
[![GitHub release](https://img.shields.io/github/v/release/tibiadata/tibiadata-api-go?sort=semver&logo=github)](https://github.com/tibiadata/tibiadata-api-go/releases)
[![Docker image size (tag)](https://img.shields.io/docker/image-size/tibiadata/tibiadata-api-go/latest?logo=docker)](https://hub.docker.com/r/tibiadata/tibiadata-api-go)
Expand Down
5 changes: 3 additions & 2 deletions src/TibiaCharactersCharacter.go
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,10 @@ func TibiaCharactersCharacterImpl(BoxContentHTML string, url string) (CharacterR
AccountInformationData.Created = TibiaDataDatetime(RowData)
case "Position:":
TmpPosition := strings.Split(RowData, "<")
if SectionName == "Character Information" {
switch SectionName {
case "Character Information":
CharacterInfoData.Position = strings.TrimSpace(TmpPosition[0])
} else if SectionName == "Account Information" {
case "Account Information":
AccountInformationData.Position = strings.TrimSpace(TmpPosition[0])
}

Expand Down
5 changes: 4 additions & 1 deletion src/TibiaDataUtils.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,10 @@ func TibiaDataStringToInteger(data string) int {

returnData, err := strconv.Atoi(str)
if err != nil {
log.Printf("[warning] TibiaDataStringToInteger: couldn't convert string into int. error: %s", err)
if TibiaDataDebug {
log.Printf("[warning] TibiaDataStringToInteger: failed to parse '%s' as integer - returning 0", data)
}
return 0
}

return returnData
Expand Down
10 changes: 6 additions & 4 deletions src/TibiaGuildsOverview.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ func TibiaGuildsOverviewImpl(world string, BoxContentHTML string, url string) (G
// Figure out the guild category
s.Find(".Text").Each(func(index int, s *goquery.Selection) {
tableName := s.Nodes[0].FirstChild.Data
if strings.Contains(tableName, "Active Guilds") {
switch {
case strings.Contains(tableName, "Active Guilds"):
GuildCategory = "active"
} else if strings.Contains(tableName, "Guilds in Course of Formation") {
case strings.Contains(tableName, "Guilds in Course of Formation"):
GuildCategory = "formation"
}
})
Expand All @@ -75,9 +76,10 @@ func TibiaGuildsOverviewImpl(world string, BoxContentHTML string, url string) (G
}

// Adding OneGuild to correct category
if GuildCategory == "active" {
switch GuildCategory {
case "active":
ActiveGuilds = append(ActiveGuilds, OneGuild)
} else if GuildCategory == "formation" {
case "formation":
FormationGuilds = append(FormationGuilds, OneGuild)
}
})
Expand Down
5 changes: 3 additions & 2 deletions src/TibiaSpellsSpell.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,11 @@ func TibiaSpellsSpellImpl(spell string, BoxContentHTML string, url string) (Spel
SectionName := s.Find(".CaptionInnerContainer div.Text").Text()

// Determine if this is the spell or rune section
if SectionName == "Spell Information" {
switch SectionName {
case "Spell Information":
SpellInformationSection = "spell"
SpellsHasSpellSection = true
} else if SectionName == "Rune Information" {
case "Rune Information":
SpellInformationSection = "rune"
SpellsHasRuneSection = true
}
Expand Down