ElyBy-Mirror/chrly
1
0
Fork 0
mirror of https://github.com/elyby/chrly.git synced 2025-05-31 14:11:51 +05:30
Code Issues Packages Projects Releases Wiki Activity

Restored logger for mojang textures providers errors

Browse Source
This commit is contained in:
ErickSkrauch
2020-04-02 02:29:14 +03:00
parent c5e92e7a02
commit 280a55d553
6 changed files with 261 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/mojang/mojang.go
View File

@@ -3,6 +3,7 @@ package mojang
import (
"bytes"
"encoding/json"
"fmt"
"io/ioutil"
"net/http"
"time"
@@ -146,7 +147,7 @@ type EmptyResponse struct {
}
func (*EmptyResponse) Error() string {
return "Empty Response"
return "200: Empty Response"
}
func (*EmptyResponse) IsMojangError() bool {
@@ -161,7 +162,7 @@ type BadRequestError struct {
}
func (e *BadRequestError) Error() string {
return e.Message
return fmt.Sprintf("400 %s: %s", e.ErrorType, e.Message)
}
func (*BadRequestError) IsMojangError() bool {
@@ -174,7 +175,7 @@ type ForbiddenError struct {
}
func (*ForbiddenError) Error() string {
return "Forbidden"
return "403: Forbidden"
}
// When you exceed the set limit of requests, this error will be returned
@@ -183,7 +184,7 @@ type TooManyRequestsError struct {
}
func (*TooManyRequestsError) Error() string {
return "Too Many Requests"
return "429: Too Many Requests"
}
func (*TooManyRequestsError) IsMojangError() bool {
@@ -197,7 +198,7 @@ type ServerError struct {
}
func (e *ServerError) Error() string {
return "Server error"
return fmt.Sprintf("%d: %s", e.Status, "Server error")
}
func (*ServerError) IsMojangError() bool {

14
api/mojang/mojang_test.go
View File

@@ -98,7 +98,7 @@ func TestUsernamesToUuids(t *testing.T) {
result, err := UsernamesToUuids([]string{""})
assert.Nil(result)
assert.IsType(&BadRequestError{}, err)
assert.EqualError(err, "profileName can not be null or empty.")
assert.EqualError(err, "400 IllegalArgumentException: profileName can not be null or empty.")
assert.Implements((*ResponseError)(nil), err)
})
@@ -119,7 +119,7 @@ func TestUsernamesToUuids(t *testing.T) {
result, err := UsernamesToUuids([]string{"Thinkofdeath", "maksimkurb"})
assert.Nil(result)
assert.IsType(&ForbiddenError{}, err)
assert.EqualError(err, "Forbidden")
assert.EqualError(err, "403: Forbidden")
assert.Implements((*ResponseError)(nil), err)
})
@@ -143,7 +143,7 @@ func TestUsernamesToUuids(t *testing.T) {
result, err := UsernamesToUuids([]string{"Thinkofdeath", "maksimkurb"})
assert.Nil(result)
assert.IsType(&TooManyRequestsError{}, err)
assert.EqualError(err, "Too Many Requests")
assert.EqualError(err, "429: Too Many Requests")
assert.Implements((*ResponseError)(nil), err)
})
@@ -164,7 +164,7 @@ func TestUsernamesToUuids(t *testing.T) {
result, err := UsernamesToUuids([]string{"Thinkofdeath", "maksimkurb"})
assert.Nil(result)
assert.IsType(&ServerError{}, err)
assert.EqualError(err, "Server error")
assert.EqualError(err, "500: Server error")
assert.Equal(500, err.(*ServerError).Status)
assert.Implements((*ResponseError)(nil), err)
})
@@ -258,7 +258,7 @@ func TestUuidToTextures(t *testing.T) {
result, err := UuidToTextures("4566e69fc90748ee8d71d7ba5aa00d20", false)
assert.Nil(result)
assert.IsType(&EmptyResponse{}, err)
assert.EqualError(err, "Empty Response")
assert.EqualError(err, "200: Empty Response")
assert.Implements((*ResponseError)(nil), err)
})
@@ -282,7 +282,7 @@ func TestUuidToTextures(t *testing.T) {
result, err := UuidToTextures("4566e69fc90748ee8d71d7ba5aa00d20", false)
assert.Nil(result)
assert.IsType(&TooManyRequestsError{}, err)
assert.EqualError(err, "Too Many Requests")
assert.EqualError(err, "429: Too Many Requests")
assert.Implements((*ResponseError)(nil), err)
})
@@ -303,7 +303,7 @@ func TestUuidToTextures(t *testing.T) {
result, err := UuidToTextures("4566e69fc90748ee8d71d7ba5aa00d20", false)
assert.Nil(result)
assert.IsType(&ServerError{}, err)
assert.EqualError(err, "Server error")
assert.EqualError(err, "500: Server error")
assert.Equal(500, err.(*ServerError).Status)
assert.Implements((*ResponseError)(nil), err)
})