1 files changed, 30 insertions, 12 deletions
diff --git a/pkg/ext/router.go b/pkg/ext/router.go
index 96da1c9..bbbffa1 100644
--- a/pkg/ext/router.go
+++ b/pkg/ext/router.go
@@ -3,10 +3,12 @@ package ext
 import (
 	"errors"
 	"fmt"
+	"log/slog"
 	"net/http"
 
 	"git.gabrielgio.me/cerrado/pkg/service"
 	"git.gabrielgio.me/cerrado/templates"
+	"github.com/go-git/go-git/v5/plumbing"
 )
 
 type (
@@ -14,8 +16,9 @@ type (
 		middlewares []Middleware
 		router      *http.ServeMux
 	}
-	Middleware          func(next http.HandlerFunc) http.HandlerFunc
-	ErrorRequestHandler func(w http.ResponseWriter, r *http.Request) error
+	HandlerFunc         func(http.ResponseWriter, *Request)
+	Middleware          func(next HandlerFunc) HandlerFunc
+	ErrorRequestHandler func(w http.ResponseWriter, r *Request) error
 )
 
 func NewRouter() *Router {
@@ -23,6 +26,7 @@ func NewRouter() *Router {
 		router: http.NewServeMux(),
 	}
 }
+
 func (r *Router) Handler() http.Handler {
 	return r.router
 }
@@ -31,13 +35,15 @@ func (r *Router) AddMiddleware(middleware Middleware) {
 	r.middlewares = append(r.middlewares, middleware)
 }
 
-func wrapError(next ErrorRequestHandler) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
+func wrapError(next ErrorRequestHandler) HandlerFunc {
+	return func(w http.ResponseWriter, r *Request) {
 		if err := next(w, r); err != nil {
-			if errors.Is(err, service.ErrRepositoryNotFound) {
-				NotFound(w)
+			if errors.Is(err, service.ErrRepositoryNotFound) ||
+				errors.Is(err, plumbing.ErrReferenceNotFound) {
+				NotFound(w, r)
 			} else {
-				InternalServerError(w, err)
+				slog.Error("Internal Server Error", "error", err)
+				InternalServerError(w, r, err)
 			}
 		}
 	}
@@ -49,7 +55,7 @@ func (r *Router) run(next ErrorRequestHandler) http.HandlerFunc {
 		for _, r := range r.middlewares {
 			req = r(req)
 		}
-		req(w, re)
+		req(w, &Request{Request: re})
 	}
 }
 
@@ -57,16 +63,28 @@ func (r *Router) HandleFunc(path string, handler ErrorRequestHandler) {
 	r.router.HandleFunc(path, r.run(handler))
 }
 
-func NotFound(w http.ResponseWriter) {
+func NotFound(w http.ResponseWriter, r *Request) {
 	w.WriteHeader(http.StatusNotFound)
 	templates.WritePageTemplate(w, &templates.ErrorPage{
 		Message: "Not Found",
-	})
+	}, r.Context())
+}
+
+func BadRequest(w http.ResponseWriter, r *Request, msg string) {
+	w.WriteHeader(http.StatusBadRequest)
+	templates.WritePageTemplate(w, &templates.ErrorPage{
+		Message: msg,
+	}, r.Context())
+}
+
+func Redirect(w http.ResponseWriter, location string) {
+	w.Header().Add("location", location)
+	w.WriteHeader(http.StatusTemporaryRedirect)
 }
 
-func InternalServerError(w http.ResponseWriter, err error) {
+func InternalServerError(w http.ResponseWriter, r *Request, err error) {
 	w.WriteHeader(http.StatusInternalServerError)
 	templates.WritePageTemplate(w, &templates.ErrorPage{
 		Message: fmt.Sprintf("Internal Server Error:\n%s", err.Error()),
-	})
+	}, r.Context())
 }