From b22a2a8beaa3941051a78d59427282e3739faed1 Mon Sep 17 00:00:00 2001 From: Tobias Lindberg Date: Fri, 7 Jan 2022 11:35:45 +0100 Subject: [PATCH 1/3] removing log printing added by accident with #34 --- src/TibiaGuildsGuildV3.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/TibiaGuildsGuildV3.go b/src/TibiaGuildsGuildV3.go index 2ed30b47..4c54970c 100644 --- a/src/TibiaGuildsGuildV3.go +++ b/src/TibiaGuildsGuildV3.go @@ -121,17 +121,13 @@ func TibiaGuildsGuildV3(c *gin.Context) { var GuildDescriptionFinished bool for _, line := range strings.Split(strings.TrimSuffix(InnerTableContainerTMPB, "\n"), "\n") { - log.Println(line) - // Guild information if !GuildDescriptionFinished { // First line is the description.. GuildDescription += strings.ReplaceAll(line+"\n", "

\n", "") - log.Println(GuildDescription) // Abort loop and continue wiht next section if strings.Contains(line, "

") { - guild = GuildDescription GuildDescription = TibiaDataSanitizeEscapedString(GuildDescription) GuildDescriptionFinished = true } From 6f566e052cb9835885e8319e586bc94f9a81df9b Mon Sep 17 00:00:00 2001 From: Tobias Lindberg Date: Fri, 7 Jan 2022 11:36:25 +0100 Subject: [PATCH 2/3] adding trim of guild description --- src/TibiaGuildsGuildV3.go | 2 +- src/TibiaGuildsOverviewV3.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/TibiaGuildsGuildV3.go b/src/TibiaGuildsGuildV3.go index 4c54970c..ffbed996 100644 --- a/src/TibiaGuildsGuildV3.go +++ b/src/TibiaGuildsGuildV3.go @@ -128,7 +128,7 @@ func TibiaGuildsGuildV3(c *gin.Context) { // Abort loop and continue wiht next section if strings.Contains(line, "

") { - GuildDescription = TibiaDataSanitizeEscapedString(GuildDescription) + GuildDescription = strings.TrimSpace(TibiaDataSanitizeEscapedString(GuildDescription)) GuildDescriptionFinished = true } diff --git a/src/TibiaGuildsOverviewV3.go b/src/TibiaGuildsOverviewV3.go index cf6e4fd5..e12fb846 100644 --- a/src/TibiaGuildsOverviewV3.go +++ b/src/TibiaGuildsOverviewV3.go @@ -85,7 +85,7 @@ func TibiaGuildsOverviewV3(c *gin.Context) { // Check if there's a description to fetch. if nameAndDescriptionNode.FirstChild.NextSibling != nil && nameAndDescriptionNode.FirstChild.NextSibling.NextSibling != nil { - description = nameAndDescriptionNode.FirstChild.NextSibling.NextSibling.Data + description = strings.TrimSpace(nameAndDescriptionNode.FirstChild.NextSibling.NextSibling.Data) } OneGuild := Guild{ From 27803835c38855e331bb082dcf3b4aaaa5a150a9 Mon Sep 17 00:00:00 2001 From: Tobias Lindberg Date: Fri, 7 Jan 2022 11:36:53 +0100 Subject: [PATCH 3/3] using guild name based on html response so we get correct upper and lower letters in name --- src/TibiaGuildsGuildV3.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/TibiaGuildsGuildV3.go b/src/TibiaGuildsGuildV3.go index ffbed996..efea07ba 100644 --- a/src/TibiaGuildsGuildV3.go +++ b/src/TibiaGuildsGuildV3.go @@ -118,9 +118,15 @@ func TibiaGuildsGuildV3(c *gin.Context) { log.Fatal(err) } - var GuildDescriptionFinished bool + var GuildNameDetected, GuildDescriptionFinished bool for _, line := range strings.Split(strings.TrimSuffix(InnerTableContainerTMPB, "\n"), "\n") { + // setting guild name based on html + if !GuildNameDetected { + guild = strings.TrimSpace(RemoveHtmlTag(line)) + GuildNameDetected = true + } + // Guild information if !GuildDescriptionFinished { // First line is the description..