Worlds & WorldsOverview func/test/webserver updates (pass url as args)

Author: Kai-Animator

src/TibiaWorldsOverview.go

@@ -46,7 +46,7 @@ var (
 )
 
 // TibiaWorldsOverview func
-func TibiaWorldsOverviewImpl(BoxContentHTML string) (WorldsOverviewResponse, error) {
+func TibiaWorldsOverviewImpl(BoxContentHTML string, url string) (WorldsOverviewResponse, error) {
 	// Loading HTML data into ReaderHTML for goquery with NewReader
 	ReaderHTML, err := goquery.NewDocumentFromReader(strings.NewReader(BoxContentHTML))
 	if err != nil {
@@ -206,7 +206,7 @@ func TibiaWorldsOverviewImpl(BoxContentHTML string) (WorldsOverviewResponse, err
 		Information{
 			APIDetails: TibiaDataAPIDetails,
 			Timestamp:  TibiaDataDatetime(""),
-			TibiaURL:       "https://www.tibia.com/community/?subtopic=worlds",
+			TibiaURL:   []string{url},
 			Status: Status{
 				HTTPCode: http.StatusOK,
 			},

src/TibiaWorldsOverview_test.go

@@ -20,15 +20,15 @@ func TestWorlds(t *testing.T) {
 		t.Fatalf("File reading error: %s", err)
 	}
 
-	worldsJson, err := TibiaWorldsOverviewImpl(string(data))
+	worldsJson, err := TibiaWorldsOverviewImpl(string(data), "https://www.tibia.com/community/?subtopic=worlds")
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	assert := assert.New(t)
 	information := worldsJson.Information
 
-	assert.Equal("https://www.tibia.com/community/?subtopic=worlds", information.TibiaURL)
+	assert.Equal("https://www.tibia.com/community/?subtopic=worlds", information.TibiaURL[0])
 
 	assert.Equal(8720, worldsJson.Worlds.PlayersOnline)
 	assert.Equal(64028, worldsJson.Worlds.RecordPlayers)

src/TibiaWorldsWorld.go

@@ -50,7 +50,7 @@ var (
 )
 
 // TibiaWorldsWorld func
-func TibiaWorldsWorldImpl(world string, BoxContentHTML string) (WorldResponse, error) {
+func TibiaWorldsWorldImpl(world string, BoxContentHTML string, url string) (WorldResponse, error) {
 	// TODO: We need to read the world name from the response rather than pass it into this func
 
 	// Loading HTML data into ReaderHTML for goquery with NewReader
@@ -230,7 +230,7 @@ func TibiaWorldsWorldImpl(world string, BoxContentHTML string) (WorldResponse, e
 		Information: Information{
 			APIDetails: TibiaDataAPIDetails,
 			Timestamp:  TibiaDataDatetime(""),
-			TibiaURL:       "https://www.tibia.com/community/?subtopic=worlds&world=" + world,
+			TibiaURL:   []string{url},
 			Status: Status{
 				HTTPCode: http.StatusOK,
 			},

src/TibiaWorldsWorld_test.go

@@ -20,7 +20,7 @@ func TestWorldEndebra(t *testing.T) {
 		t.Fatalf("File reading error: %s", err)
 	}
 
-	worldJson, err := TibiaWorldsWorldImpl("Endebra", string(data))
+	worldJson, err := TibiaWorldsWorldImpl("Endebra", string(data), "https://www.tibia.com/community/?subtopic=worlds&world=Endebra")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -29,7 +29,7 @@ func TestWorldEndebra(t *testing.T) {
 	world := worldJson.World
 	information := worldJson.Information
 
-	assert.Equal("https://www.tibia.com/community/?subtopic=worlds&world=Endebra", information.TibiaURL)
+	assert.Equal("https://www.tibia.com/community/?subtopic=worlds&world=Endebra", information.TibiaURL[0])
 
 	assert.Equal("Endebra", world.Name)
 	assert.Equal("online", world.Status)
@@ -61,7 +61,7 @@ func TestWorldPremia(t *testing.T) {
 		t.Fatalf("File reading error: %s", err)
 	}
 
-	worldJson, err := TibiaWorldsWorldImpl("Premia", string(data))
+	worldJson, err := TibiaWorldsWorldImpl("Premia", string(data), "")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -103,7 +103,7 @@ func TestWorldWintera(t *testing.T) {
 		t.Fatalf("File reading error: %s", err)
 	}
 
-	worldJson, err := TibiaWorldsWorldImpl("Wintera", string(data))
+	worldJson, err := TibiaWorldsWorldImpl("Wintera", string(data), "")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -150,7 +150,7 @@ func TestWorldZuna(t *testing.T) {
 		t.Fatalf("File reading error: %s", err)
 	}
 
-	worldJson, err := TibiaWorldsWorldImpl("Zuna", string(data))
+	worldJson, err := TibiaWorldsWorldImpl("Zuna", string(data), "")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -195,7 +195,7 @@ func TestWorldOceanis(t *testing.T) {
 		t.Fatalf("File reading error: %s", err)
 	}
 
-	worldJson, err := TibiaWorldsWorldImpl("Oceanis", string(data))
+	worldJson, err := TibiaWorldsWorldImpl("Oceanis", string(data), "")
 	if err != nil {
 		t.Fatal(err)
 	}

src/webserver.go

@@ -1033,7 +1033,7 @@ func tibiaWorldsOverview(c *gin.Context) {
 		c,
 		tibiadataRequest,
 		func(BoxContentHTML string) (interface{}, error) {
-			return TibiaWorldsOverviewImpl(BoxContentHTML)
+			return TibiaWorldsOverviewImpl(BoxContentHTML, tibiadataRequest.URL)
 		},
 		"TibiaWorldsOverview")
 }
@@ -1078,7 +1078,7 @@ func tibiaWorldsWorld(c *gin.Context) {
 		c,
 		tibiadataRequest,
 		func(BoxContentHTML string) (interface{}, error) {
-			return TibiaWorldsWorldImpl(world, BoxContentHTML)
+			return TibiaWorldsWorldImpl(world, BoxContentHTML, tibiadataRequest.URL)
 		},
 		"TibiaWorldsWorld")
 }