diff options
Diffstat (limited to 'forged/internal/incoming/web/router.go')
| -rw-r--r-- | forged/internal/incoming/web/router.go | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/forged/internal/incoming/web/router.go b/forged/internal/incoming/web/router.go index 8356191..3809afb 100644 --- a/forged/internal/incoming/web/router.go +++ b/forged/internal/incoming/web/router.go @@ -7,7 +7,6 @@ import ( "sort" "strings" - "go.lindenii.runxiyu.org/forge/forged/internal/database/queries" "go.lindenii.runxiyu.org/forge/forged/internal/global" wtypes "go.lindenii.runxiyu.org/forge/forged/internal/incoming/web/types" ) @@ -62,7 +61,6 @@ type Router struct { user UserResolver global *global.Global reverseProxy bool - queries *queries.Queries } func NewRouter() *Router { return &Router{} } @@ -71,10 +69,6 @@ func (r *Router) Global(g *global.Global) *Router { r.global = g return r } -func (r *Router) Queries(q *queries.Queries) *Router { - r.queries = q - return r -} func (r *Router) ReverseProxy(enabled bool) *Router { r.reverseProxy = enabled; return r } func (r *Router) Errors(e ErrorRenderers) *Router { r.errors = e; return r } func (r *Router) UserResolver(u UserResolver) *Router { r.user = u; return r } @@ -148,7 +142,6 @@ func (r *Router) ServeHTTP(w http.ResponseWriter, req *http.Request) { Global: r.global, URLSegments: segments, DirMode: dirMode, - Queries: r.queries, } req = req.WithContext(wtypes.WithBaseData(req.Context(), bd)) @@ -202,7 +195,7 @@ func (r *Router) ServeHTTP(w http.ResponseWriter, req *http.Request) { bd.GroupPath = strings.Split(g, "/") } - if rt.method != "" && !(rt.method == method || (method == http.MethodHead && rt.method == http.MethodGet)) { + if rt.method != "" && rt.method != method && (method != http.MethodHead || rt.method != http.MethodGet) { continue } @@ -423,6 +416,4 @@ func GetParamRefTypeName(request *http.Request) (retRefType, retRefName string, return } -var ( - errDupRefSpec = fmt.Errorf("duplicate ref specifications") -) +var errDupRefSpec = fmt.Errorf("duplicate ref specifications") |