Add query parameter to disable query lookup
This commit is contained in:
@@ -31,11 +31,13 @@ func JavaStatusHandler(ctx *fiber.Ctx) error {
|
||||
return ctx.Status(http.StatusBadRequest).SendString("Invalid address value")
|
||||
}
|
||||
|
||||
enableQuery := ctx.QueryBool("query", true)
|
||||
|
||||
if err = r.Increment(fmt.Sprintf("java-hits:%s-%d", host, port)); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
response, expiresAt, err := GetJavaStatus(host, port)
|
||||
response, expiresAt, err := GetJavaStatus(host, port, enableQuery)
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -62,7 +64,7 @@ func JavaWidgetHandler(ctx *fiber.Ctx) error {
|
||||
return err
|
||||
}
|
||||
|
||||
response, _, err := GetJavaStatus(host, port)
|
||||
response, _, err := GetJavaStatus(host, port, false)
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
|
||||
@@ -113,8 +113,8 @@ type Plugin struct {
|
||||
}
|
||||
|
||||
// GetJavaStatus returns the status response of a Java Edition server, either using cache or fetching a fresh status.
|
||||
func GetJavaStatus(host string, port uint16) (*JavaStatusResponse, time.Duration, error) {
|
||||
cacheKey := fmt.Sprintf("java:%s-%d", host, port)
|
||||
func GetJavaStatus(host string, port uint16, enableQuery bool) (*JavaStatusResponse, time.Duration, error) {
|
||||
cacheKey := fmt.Sprintf("java:%v-%s-%d", enableQuery, host, port)
|
||||
|
||||
cache, ttl, err := r.Get(cacheKey)
|
||||
|
||||
@@ -130,7 +130,7 @@ func GetJavaStatus(host string, port uint16) (*JavaStatusResponse, time.Duration
|
||||
return &response, ttl, err
|
||||
}
|
||||
|
||||
response := FetchJavaStatus(host, port)
|
||||
response := FetchJavaStatus(host, port, enableQuery)
|
||||
|
||||
data, err := json.Marshal(response)
|
||||
|
||||
@@ -218,11 +218,9 @@ func GetServerIcon(host string, port uint16) ([]byte, time.Duration, error) {
|
||||
}
|
||||
|
||||
// FetchJavaStatus fetches fresh information about a Java Edition Minecraft server.
|
||||
func FetchJavaStatus(host string, port uint16) JavaStatusResponse {
|
||||
func FetchJavaStatus(host string, port uint16, enableQuery bool) JavaStatusResponse {
|
||||
var wg sync.WaitGroup
|
||||
|
||||
wg.Add(2)
|
||||
|
||||
var status interface{} = nil
|
||||
var query *response.FullQuery = nil
|
||||
|
||||
@@ -236,6 +234,9 @@ func FetchJavaStatus(host string, port uint16) JavaStatusResponse {
|
||||
}
|
||||
}()
|
||||
|
||||
wg.Add(1)
|
||||
|
||||
if enableQuery {
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
|
||||
@@ -244,6 +245,9 @@ func FetchJavaStatus(host string, port uint16) JavaStatusResponse {
|
||||
})
|
||||
}()
|
||||
|
||||
wg.Add(1)
|
||||
}
|
||||
|
||||
wg.Wait()
|
||||
|
||||
return BuildJavaResponse(host, port, status, query)
|
||||
|
||||
Reference in New Issue
Block a user