(.*)<\/a>(.*)<\/td>| (.*)<\/td> | ([0-9]+)<\/td> | (.*)<\/td> | (.*)<\/span><\/td>`)
+ subma1 := regex1.FindAllStringSubmatch(GuildsDivHTML, -1)
+
+ if len(subma1) > 0 {
+ // Rank name
+ if len(subma1[0][1]) > 2 {
+ MembersRank = subma1[0][1]
+ }
+
+ // Title
+ MembersTitle = strings.ReplaceAll(strings.ReplaceAll(subma1[0][3], " (", ""), ")", "")
+
+ // Status
+ if strings.Contains(subma1[0][7], "online") {
+ MembersStatus = "online"
+ MembersCountOnline++
+ } else {
+ MembersStatus = "offline"
+ MembersCountOffline++
+ }
+
+ MembersData = append(MembersData, Members{
+ Name: TibiadataUnescapeStringV3(subma1[0][2]),
+ Title: MembersTitle,
+ Rank: MembersRank,
+ Vocation: subma1[0][4],
+ Level: TibiadataStringToIntegerV3(subma1[0][5]),
+ Joined: TibiadataDateV3(subma1[0][6]),
+ Status: MembersStatus,
+ })
+
+ } else {
+
+ // Regex to get data for record values
+ regex2 := regexp.MustCompile(` | (.*)<\/a><\/td>| (.*)<\/td>`)
+ subma2 := regex2.FindAllStringSubmatch(GuildsDivHTML, -1)
+
+ if len(subma2) > 0 {
+ MembersCountInvited++
+ InvitedData = append(InvitedData, Invited{
+ Name: subma2[0][1],
+ Date: subma2[0][2],
+ })
+ }
+ }
+ })
+
+ //
+ // Build the data-blob
+ jsonData := JSONData{
+ Guilds{
+ Guild{
+ Name: guild,
+ World: GuildWorld,
+ LogoURL: GuildLogoURL,
+ Description: GuildDescription,
+ Guildhalls: GuildGuildhallData,
+ Active: GuildActive,
+ Founded: GuildFounded,
+ Applications: GuildApplications,
+ Homepage: GuildHomepage,
+ InWar: GuildInWar,
+ DisbandedDate: GuildDisbandedDate,
+ DisbandedCondition: GuildDisbandedCondition,
+
+ PlayersOnline: MembersCountOnline,
+ PlayersOffline: MembersCountOffline,
+ MembersTotal: (MembersCountOnline + MembersCountOffline),
+ MembersInvited: MembersCountInvited,
+ Members: MembersData,
+ Invited: InvitedData,
+ },
+ },
+ Information{
+ APIVersion: TibiadataAPIversion,
+ Timestamp: TibiadataDatetimeV3(""),
+ },
+ }
+
+ // return jsonData
+ TibiaDataAPIHandleSuccessResponse(c, "TibiaGuildsGuildV3", jsonData)
+}
diff --git a/src/TibiaGuildsOverviewV3.go b/src/TibiaGuildsOverviewV3.go
new file mode 100644
index 00000000..96fd07a9
--- /dev/null
+++ b/src/TibiaGuildsOverviewV3.go
@@ -0,0 +1,109 @@
+package main
+
+import (
+ "log"
+ "regexp"
+ "strings"
+
+ "github.com/PuerkitoBio/goquery"
+ "github.com/gin-gonic/gin"
+)
+
+// TibiaGuildsOverviewV3 func
+func TibiaGuildsOverviewV3(c *gin.Context) {
+
+ // getting params from URL
+ world := c.Param("world")
+
+ // Child of Guilds
+ type Guild struct {
+ Name string `json:"name"`
+ LogoURL string `json:"logo_url"`
+ Description string `json:"description"`
+ }
+
+ // Child of JSONData
+ type Guilds struct {
+ World string `json:"world"`
+ Active []Guild `json:"active"`
+ Formation []Guild `json:"formation"`
+ }
+
+ //
+ // The base includes two levels: Guilds and Information
+ type JSONData struct {
+ Guilds Guilds `json:"guilds"`
+ Information Information `json:"information"`
+ }
+
+ // Creating empty vars
+ var ActiveGuilds, FormationGuilds []Guild
+ var GuildCategory string
+
+ // Adding fix for First letter to be upper and rest lower
+ world = TibiadataStringWorldFormatToTitleV3(world)
+
+ // Getting data with TibiadataHTMLDataCollectorV3
+ BoxContentHTML := TibiadataHTMLDataCollectorV3("https://www.tibia.com/community/?subtopic=guilds&world=" + TibiadataQueryEscapeStringV3(world))
+
+ // Loading HTML data into ReaderHTML for goquery with NewReader
+ ReaderHTML, err := goquery.NewDocumentFromReader(strings.NewReader(BoxContentHTML))
+ if err != nil {
+ log.Fatal(err)
+ }
+
+ // Running query over each div
+ ReaderHTML.Find(".Table3 .TableContent tbody tr").Each(func(index int, s *goquery.Selection) {
+
+ // Storing HTML into GuildsDivHTML
+ GuildsDivHTML, err := s.Html()
+ if err != nil {
+ log.Fatal(err)
+ }
+
+ // Removing linebreaks from HTML
+ //GuildsDivHTML = TibiadataHTMLRemoveLinebreaksV3(GuildsDivHTML)
+
+ if GuildCategory == "" && strings.Contains(GuildsDivHTML, " | Logo | ") {
+ GuildCategory = "active"
+ } else if GuildCategory == "active" && strings.Contains(GuildsDivHTML, "Logo | ") {
+ GuildCategory = "formation"
+ }
+
+ // Regex to get data for record values
+ regex1 := regexp.MustCompile(`) <\/td> | (.*)<\/b>()?(.*)<\/td> | .*`)
+ subma1 := regex1.FindAllStringSubmatch(GuildsDivHTML, -1)
+
+ if len(subma1) > 0 {
+ OneGuild := Guild{
+ Name: TibiadataUnescapeStringV3(subma1[0][2]),
+ LogoURL: subma1[0][1],
+ Description: TibiadataUnescapeStringV3(strings.TrimSpace(subma1[0][4])),
+ }
+
+ // Adding OneWorld to correct category
+ if GuildCategory == "active" {
+ ActiveGuilds = append(ActiveGuilds, OneGuild)
+ } else if GuildCategory == "formation" {
+ FormationGuilds = append(FormationGuilds, OneGuild)
+ }
+ }
+ })
+
+ //
+ // Build the data-blob
+ jsonData := JSONData{
+ Guilds{
+ World: world,
+ Active: ActiveGuilds,
+ Formation: FormationGuilds,
+ },
+ Information{
+ APIVersion: TibiadataAPIversion,
+ Timestamp: TibiadataDatetimeV3(""),
+ },
+ }
+
+ // return jsonData
+ TibiaDataAPIHandleSuccessResponse(c, "TibiaGuildsOverviewV3", jsonData)
+}
diff --git a/src/webserver.go b/src/webserver.go
index ec5b27b7..867de128 100644
--- a/src/webserver.go
+++ b/src/webserver.go
@@ -113,6 +113,12 @@ func main() {
// Tibia fansites
v3.GET("/fansites", TibiaFansitesV3)
+ // Tibia guilds
+ v3.GET("/guilds/guild/:guild", TibiaGuildsGuildV3)
+ //v3.GET("/guilds/guild/:guild/events",TibiaGuildsGuildEventsV3)
+ //v3.GET("/guilds/guild/:guild/wars",TibiaGuildsGuildWarsV3)
+ v3.GET("/guilds/world/:world", TibiaGuildsOverviewV3)
+
// Tibia highscores
v3.GET("/highscores/world/:world", func(c *gin.Context) {
c.Redirect(http.StatusMovedPermanently, v3.BasePath()+"/highscores/"+c.Param("world")+"/experience/"+TibiadataDefaultVoc)
@@ -320,9 +326,15 @@ func TibiadataUnescapeStringV3(data string) string {
return html.UnescapeString(data)
}
-// TibiadataQueryEscapeStringV3 func
+// TibiadataQueryEscapeStringV3 func - encode string to be correct formatted
func TibiadataQueryEscapeStringV3(data string) string {
+ // switching "+" to " "
+ data = strings.ReplaceAll(data, "+", " ")
+
+ // encoding string to latin-1
data, _ = TibiaDataConvertEncodingtoISO88591(data)
+
+ // returning with QueryEscape function
return url.QueryEscape(data)
}
| |