multi-protocol client

Fixes #4

2 files changed, 8 insertions, 4 deletions

diff --git a/gemini/client.go b/gemini/client.go
index 34d5839..0a621dd 100644
--- a/gemini/client.go
+++ b/gemini/client.go
@@ -54,7 +54,7 @@ func (client Client) RoundTrip(request *types.Request) (*types.Response, error)
 	}
 
 	tlsConf := client.tlsConf
-	if (tlsConf == nil) {
+	if tlsConf == nil {
 		tlsConf = &tls.Config{InsecureSkipVerify: true}
 	}
 
@@ -102,12 +102,12 @@ func (c Client) Fetch(url string) (*types.Response, error) {
 		if err != nil {
 			return nil, err
 		}
-		if ResponseCategoryForStatus(response.Status) != ResponseCategoryRedirect {
+		if !c.IsRedirect(response) {
 			return response, nil
 		}
 
 		prev := u
-		u, err = neturl.Parse(url)
+		u, err = neturl.Parse(response.Meta.(string))
 		if err != nil {
 			return nil, err
 		}
@@ -116,3 +116,7 @@ func (c Client) Fetch(url string) (*types.Response, error) {
 
 	return nil, ExceededMaxRedirects
 }
+
+func (c Client) IsRedirect(response *types.Response) bool {
+	return ResponseCategoryForStatus(response.Status) == ResponseCategoryRedirect
+}
diff --git a/gemini/response.go b/gemini/response.go
index 13f493a..b3e53aa 100644
--- a/gemini/response.go
+++ b/gemini/response.go
@@ -44,7 +44,7 @@ const (
 )
 
 func ResponseCategoryForStatus(status types.Status) ResponseCategory {
-	return ResponseCategory(status / 10)
+	return ResponseCategory((status / 10) * 10)
 }
 
 const (