allow middlewares to abort handler execution

handler/middleware.go

@@ -5,7 +5,7 @@ import (
 )
 
 type (
-	Handler func(e *events.InteractionCreate)
+	Handler func(e *events.InteractionCreate) error
 
 	Middleware func(next Handler) Handler
 

handler/middleware/logger.go

@@ -6,8 +6,8 @@ import (
 )
 
 var Logger handler.Middleware = func(next handler.Handler) handler.Handler {
-	return func(e *events.InteractionCreate) {
+	return func(e *events.InteractionCreate) error {
 		e.Client().Logger().Infof("handling interaction: %s\n", e.Interaction.ID())
-		next(e)
+		return next(e)
 	}
 }

handler/middleware/print.go

@@ -7,9 +7,9 @@ import (
 
 func Print(content string) handler.Middleware {
 	return func(next handler.Handler) handler.Handler {
-		return func(event *events.InteractionCreate) {
+		return func(event *events.InteractionCreate) error {
 			println(content)
-			next(event)
+			return next(event)
 		}
 	}
 }

handler/mux.go

@@ -84,22 +84,25 @@ func (r *Mux) Match(path string, t discord.InteractionType) bool {
 
 // Handle handles the given interaction event.
 func (r *Mux) Handle(path string, variables map[string]string, e *events.InteractionCreate) error {
-	path = parseVariables(path, r.pattern, variables)
-	middlewares := func(event *events.InteractionCreate) {}
-	for i := len(r.middlewares) - 1; i >= 0; i-- {
-		middlewares = r.middlewares[i](middlewares)
-	}
-	middlewares(e)
+	handlerChain := func(event *events.InteractionCreate) error {
+		path = parseVariables(path, r.pattern, variables)
 
-	for _, route := range r.routes {
-		if route.Match(path, e.Type()) {
-			return route.Handle(path, variables, e)
+		for _, route := range r.routes {
+			if route.Match(path, e.Type()) {
+				return route.Handle(path, variables, e)
+			}
+		}
+		if r.notFoundHandler != nil {
+			return r.notFoundHandler(e)
 		}
+		return nil
 	}
-	if r.notFoundHandler != nil {
-		return r.notFoundHandler(e)
+
+	for i := len(r.middlewares) - 1; i >= 0; i-- {
+		handlerChain = r.middlewares[i](handlerChain)
 	}
-	return nil
+
+	return handlerChain(e)
 }
 
 // Use adds the given middlewares to the current Router.