diff --git a/examples/auth.go b/examples/auth.go index d61970e..d0ddf0b 100644 --- a/examples/auth.go +++ b/examples/auth.go @@ -74,8 +74,8 @@ func changeUsername(w *gemini.ResponseWriter, r *gemini.Request) { return } - username, ok := gemini.Input(r) - if !ok { + username, err := gemini.QueryUnescape(r.URL.RawQuery) + if err != nil || username == "" { w.WriteHeader(gemini.StatusInput, "Username") return } diff --git a/server.go b/server.go index 239a176..9058aea 100644 --- a/server.go +++ b/server.go @@ -335,23 +335,3 @@ type ResponderFunc func(*ResponseWriter, *Request) func (f ResponderFunc) Respond(w *ResponseWriter, r *Request) { f(w, r) } - -// Input returns the request query. -// If the query is invalid or no query is provided, ok will be false. -// -// Example: -// -// input, ok := gemini.Input(req) -// if !ok { -// w.WriteHeader(gemini.StatusInput, "Prompt") -// return -// } -// // ... -// -func Input(r *Request) (query string, ok bool) { - if r.URL.ForceQuery || r.URL.RawQuery != "" { - query, err := url.QueryUnescape(r.URL.RawQuery) - return query, err == nil - } - return "", false -}