diff --git a/pages/index.go b/pages/index.go index 7a105ad6..f813eba1 100644 --- a/pages/index.go +++ b/pages/index.go @@ -139,8 +139,7 @@ func Configure(app *aero.Application) { l.Page("/compare/animelist/:nick-1/:nick-2", compare.AnimeList) // Search - l.Page("/search", search.Get) - l.Page("/search/:term", search.Get) + l.Page("/search/*term", search.Get) // Shop l.Page("/shop", shop.Get) diff --git a/pages/search/search.go b/pages/search/search.go index 18228637..1d7d74bd 100644 --- a/pages/search/search.go +++ b/pages/search/search.go @@ -1,6 +1,8 @@ package search import ( + "strings" + "github.com/aerogo/aero" "github.com/animenotifier/arn" "github.com/animenotifier/notify.moe/components" @@ -14,7 +16,8 @@ const maxTracks = 4 // Get search page. func Get(ctx *aero.Context) string { - term := ctx.Query("q") + term := ctx.Get("term") + term = strings.TrimPrefix(term, "/") users, animes, posts, threads, tracks := arn.Search(term, maxUsers, maxAnime, maxPosts, maxThreads, maxTracks) return ctx.HTML(components.SearchResults(term, users, animes, posts, threads, tracks)) diff --git a/rewrite.go b/rewrite.go index 3cf40ce4..7c0b4e20 100644 --- a/rewrite.go +++ b/rewrite.go @@ -25,21 +25,6 @@ func rewrite(ctx *aero.RewriteContext) { return } - // Search - if strings.HasPrefix(requestURI, "/search/") { - searchTerm := requestURI[len("/search/"):] - ctx.Request.URL.RawQuery = "q=" + searchTerm - ctx.SetURI("/search") - return - } - - if strings.HasPrefix(requestURI, "/_/search/") { - searchTerm := requestURI[len("/_/search/"):] - ctx.Request.URL.RawQuery = "q=" + searchTerm - ctx.SetURI("/_/search") - return - } - // Analytics if requestURI == "/dark-flame-master" { ctx.SetURI("/api/new/analytics")