use error interface for error model

nothub · Feb 4, 2023 · a0cbc12 · a0cbc12
1 parent e83b473
commit a0cbc12
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 21 deletions.
diff --git a/modrinth/api/error.go b/modrinth/api/error.go
@@ -3,10 +3,10 @@ package api
 import "fmt"
 
 type Error struct {
-	Error       string `json:"error"`
+	Name        string `json:"error"`
 	Description string `json:"description"`
 }
 
-func (e *Error) String() string {
-	return fmt.Sprint(e.Error, e.Description)
+func (e *Error) Error() string {
+	return fmt.Sprintf("%s (%s)", e.Description, e.Name)
 }
diff --git a/requester/client.go b/requester/client.go
@@ -13,43 +13,39 @@ import (
 	"strconv"
 )
 
-type ErrorModel interface {
-	String() string
-}
-
 var DefaultHttpClient = NewHTTPClient()
 
-func (httpClient *HTTPClient) GetJson(url string, respModel interface{}, errModel ErrorModel) error {
-	request, err := http.NewRequest(http.MethodGet, url, nil)
+func (httpClient *HTTPClient) GetJson(url string, respModel interface{}, errModel error) error {
+	req, err := http.NewRequest(http.MethodGet, url, nil)
 	if err != nil {
 		return err
 	}
-	request.Header.Set("User-Agent", httpClient.UserAgent)
-	request.Header.Set("Accept", "application/json")
-	request.Close = true
+	req.Header.Set("User-Agent", httpClient.UserAgent)
+	req.Header.Set("Accept", "application/json")
+	req.Close = true
 
-	response, err := httpClient.sendRequest(request)
+	res, err := httpClient.sendRequest(req)
 	if err != nil {
 		return err
 	}
 
-	defer func(Body io.ReadCloser) {
+	defer func(Body io.Closer) {
 		err := Body.Close()
 		if err != nil {
 			fmt.Println(err)
 		}
-	}(response.Body)
+	}(res.Body)
 
-	if response.StatusCode < http.StatusOK || response.StatusCode >= http.StatusBadRequest {
-		if errModel == nil || json.NewDecoder(response.Body).Decode(&errModel) != nil {
-			return errors.New("http status " + strconv.Itoa(response.StatusCode))
+	if res.StatusCode < http.StatusOK || res.StatusCode >= http.StatusBadRequest {
+		if errModel == nil || json.NewDecoder(res.Body).Decode(&errModel) != nil {
+			return errors.New("http status " + strconv.Itoa(res.StatusCode))
 		}
-		return errors.New("http status " + strconv.Itoa(response.StatusCode) + " - " + errModel.String())
+		return errors.New("http status " + strconv.Itoa(res.StatusCode) + " - " + errModel.Error())
 	}
 
-	err = json.NewDecoder(response.Body).Decode(&respModel)
+	err = json.NewDecoder(res.Body).Decode(&respModel)
 	if err != nil {
-		return errors.New("http status " + strconv.Itoa(response.StatusCode) + " - " + err.Error())
+		return errors.New("http status " + strconv.Itoa(res.StatusCode) + " - " + err.Error())
 	}
 
 	return nil