web: add NewError function to simplify error creation, use it

2 files changed, 27 insertions, 20 deletions

diff --git a/web/discordwebhook/webhook.go b/web/discordwebhook/webhook.go
index a5dc1fc..6cbe6d1 100644
--- a/web/discordwebhook/webhook.go
+++ b/web/discordwebhook/webhook.go
@@ -4,7 +4,6 @@ package discordwebhook
 import (
 	"bytes"
 	"encoding/json"
-	"io/ioutil"
 	"net/http"
 
 	"github.com/Xe/x/web"
@@ -61,24 +60,7 @@ func Send(whurl string, w Webhook) *http.Request {
 // Validate validates the response from Discord.
 func Validate(resp *http.Response) error {
 	if resp.StatusCode/100 != 2 {
-		data, err := ioutil.ReadAll(resp.Body)
-		if err != nil {
-			return err
-		}
-		resp.Body.Close()
-
-		loc, err := resp.Location()
-		if err != nil {
-			return err
-		}
-
-		return &web.Error{
-			WantStatus:   200,
-			GotStatus:    resp.StatusCode,
-			URL:          loc,
-			Method:       resp.Request.Method,
-			ResponseBody: string(data),
-		}
+		return web.NewError(http.StatusOK, resp)
 	}
 
 	return nil
diff --git a/web/error.go b/web/error.go
index e4ffcab..051d61d 100644
--- a/web/error.go
+++ b/web/error.go
@@ -4,12 +4,37 @@ package web
 
 import (
 	"fmt"
+	"io/ioutil"
+	"net/http"
 	"net/url"
 
 	"within.website/ln"
 )
 
-// Error is an API error.
+// NewError creates an Error based on an expected HTTP status code vs data populated
+// from an HTTP response.
+func NewError(wantStatusCode int, resp *http.Response) error {
+	data, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return err
+	}
+	resp.Body.Close()
+
+	loc, err := resp.Location()
+	if err != nil {
+		return err
+	}
+
+	return &Error{
+		WantStatus:   wantStatusCode,
+		GotStatus:    resp.StatusCode,
+		URL:          loc,
+		Method:       resp.Request.Method,
+		ResponseBody: string(data),
+	}
+}
+
+// Error is a web response error. Use this when API calls don't work out like you wanted them to.
 type Error struct {
 	WantStatus, GotStatus int
 	URL                   *url.URL