[chore] The Big Middleware and API Refactor (tm) (#1250)

* interim commit: start refactoring middlewares into package under router

* another interim commit, this is becoming a big job

* another fucking massive interim commit

* refactor bookmarks to new style

* ambassador, wiz zeze commits you are spoiling uz

* she compiles, we're getting there

* we're just normal men; we're just innocent men

* apiutil

* whoopsie

* i'm glad noone reads commit msgs haha :blob_sweat:

* use that weirdo go-bytesize library for maxMultipartMemory

* fix media module paths

1 files changed, 9 insertions, 14 deletions

diff --git a/internal/api/client/search/search.go b/internal/api/client/search/search.go
index 71370a6d5..bebe0bd61 100644
--- a/internal/api/client/search/search.go
+++ b/internal/api/client/search/search.go
@@ -21,17 +21,16 @@ package search
 import (
 	"net/http"
 
-	"github.com/superseriousbusiness/gotosocial/internal/api"
+	"github.com/gin-gonic/gin"
 	"github.com/superseriousbusiness/gotosocial/internal/processing"
-	"github.com/superseriousbusiness/gotosocial/internal/router"
 )
 
 const (
-	// BasePathV1 is the base path for serving v1 of the search API
-	BasePathV1 = "/api/v1/search"
+	// BasePathV1 is the base path for serving v1 of the search API, minus the 'api' prefix
+	BasePathV1 = "/v1/search"
 
-	// BasePathV2 is the base path for serving v2 of the search API
-	BasePathV2 = "/api/v2/search"
+	// BasePathV2 is the base path for serving v2 of the search API, minus the 'api' prefix
+	BasePathV2 = "/v2/search"
 
 	// AccountIDKey -- If provided, statuses returned will be authored only by this account
 	AccountIDKey = "account_id"
@@ -62,21 +61,17 @@ const (
 	TypeStatuses = "statuses"
 )
 
-// Module implements the ClientAPIModule interface for everything related to searching
 type Module struct {
 	processor processing.Processor
 }
 
-// New returns a new search module
-func New(processor processing.Processor) api.ClientModule {
+func New(processor processing.Processor) *Module {
 	return &Module{
 		processor: processor,
 	}
 }
 
-// Route attaches all routes from this module to the given router
-func (m *Module) Route(r router.Router) error {
-	r.AttachHandler(http.MethodGet, BasePathV1, m.SearchGETHandler)
-	r.AttachHandler(http.MethodGet, BasePathV2, m.SearchGETHandler)
-	return nil
+func (m *Module) Route(attachHandler func(method string, path string, f ...gin.HandlerFunc) gin.IRoutes) {
+	attachHandler(http.MethodGet, BasePathV1, m.SearchGETHandler)
+	attachHandler(http.MethodGet, BasePathV2, m.SearchGETHandler)
 }