Switch Handler to an interface.

HandlerFunc is much better as a function returning a Handler, rather
than a newtype for the function type itself. This way there is no
confusion creating a type-inferenced variable with HandlerFunc(func(...
and then using a HandlerFunc where a Handler is expected. Much better to
only have one public type.

1 files changed, 4 insertions, 4 deletions

diff --git a/gemini/serve.go b/gemini/serve.go
index 60e0242..2f93153 100644
--- a/gemini/serve.go
+++ b/gemini/serve.go
@@ -94,7 +94,7 @@ func (s *server) handleConn(conn net.Conn) {
 				_, _ = io.Copy(conn, NewResponseReader(Failure(err)))
 			}
 		}()
-		response = s.handler(ctx, request)
+		response = s.handler.Handle(ctx, request)
 		if response == nil {
 			response = NotFound("Resource does not exist.")
 		}
@@ -127,12 +127,12 @@ func sizeParam(path string) (int, error) {
 // Filtered requests will be turned away with a 53 response "proxy request refused".
 func GeminiOnly(allowTitan bool) gus.Middleware {
 	return func(inner gus.Handler) gus.Handler {
-		return func(ctx context.Context, request *gus.Request) *gus.Response {
+		return gus.HandlerFunc(func(ctx context.Context, request *gus.Request) *gus.Response {
 			if request.Scheme == "gemini" || (allowTitan && request.Scheme == "titan") {
-				return inner(ctx, request)
+				return inner.Handle(ctx, request)
 			}
 
 			return RefuseProxy("Non-gemini protocol requests are not supported.")
-		}
+		})
 	}
 }