Skip to content

Fix invalid json v3 #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 29, 2023
Merged

Fix invalid json v3 #258

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db7f3eb
webserver: return on error and check if location is not nil
phenpessoa Sep 26, 2023
7b26796
webserver: return on error and check if location is not nil, and fix …
phenpessoa Sep 26, 2023
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
19 changes: 11 additions & 8 deletions src/webserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"net/http"
"os"
"os/signal"
"reflect"
"strconv"
"strings"
"time"
Expand All @@ -20,10 +21,8 @@ import (
"github.com/go-resty/resty/v2"
)

var (
// TibiaData app resty vars
TibiaDataUserAgent, TibiaDataProxyDomain string
)
// TibiaData app resty vars
var TibiaDataUserAgent, TibiaDataProxyDomain string

// Information - child of JSONData
type Information struct {
Expand Down Expand Up @@ -101,8 +100,8 @@ func runWebServer() {

// Tibia guilds
v3.GET("/guild/:name", tibiaGuildsGuildV3)
//v3.GET("/guild/:name/events",TibiaGuildsGuildEventsV3)
//v3.GET("/guild/:name/wars",TibiaGuildsGuildWarsV3)
// v3.GET("/guild/:name/events",TibiaGuildsGuildEventsV3)
// v3.GET("/guild/:name/wars",TibiaGuildsGuildWarsV3)
v3.GET("/guilds/:world", tibiaGuildsOverviewV3)

// Tibia highscores
Expand Down Expand Up @@ -466,6 +465,10 @@ func tibiaHousesOverviewV3(c *gin.Context) {
town = TibiaDataStringWorldFormatToTitleV3(town)

jsonData := TibiaHousesOverviewV3Impl(c, world, town, TibiaDataHTMLDataCollectorV3)
// An error occured, prevent sending an invalid json
if reflect.DeepEqual(jsonData, HousesOverviewResponse{}) {
return
}

// return jsonData
TibiaDataAPIHandleResponse(c, http.StatusOK, "TibiaHousesOverviewV3", jsonData)
Expand Down Expand Up @@ -757,10 +760,10 @@ func tibiaWorldsWorldV3(c *gin.Context) {

func tibiaDataRequestHandler(c *gin.Context, tibiaDataRequest TibiaDataRequestStruct, requestHandler func(string) (interface{}, int), handlerName string) {
BoxContentHTML, err := TibiaDataHTMLDataCollectorV3(tibiaDataRequest)

// return error (e.g. for maintenance mode)
if err != nil {
TibiaDataAPIHandleResponse(c, http.StatusBadGateway, handlerName, gin.H{"error": err.Error()})
return
}

jsonData, httpStatusCode := requestHandler(BoxContentHTML)
Expand Down Expand Up @@ -936,6 +939,6 @@ func readyz(c *gin.Context) {
c.JSON(http.StatusServiceUnavailable, gin.H{"error": http.StatusText(http.StatusServiceUnavailable)})
return
}
//c.JSON(http.StatusOK, gin.H{"status": http.StatusText(http.StatusOK)})
// c.JSON(http.StatusOK, gin.H{"status": http.StatusText(http.StatusOK)})
TibiaDataAPIHandleResponse(c, http.StatusOK, "readyz", gin.H{"status": http.StatusText(http.StatusOK)})
}