diff options
| author | Till <2353100+S7evinK@users.noreply.github.com> | 2023-03-17 12:09:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-17 11:09:45 +0000 |
| commit | 5579121c6f27105342a2aea05cf9a3119d73cecb (patch) | |
| tree | 1d8b7bec90079b6f693585d306c19019ea426870 /syncapi/routing | |
| parent | d88f71ab71a60348518f7fa6735ac9f0bfb472c3 (diff) | |
Preparations for removing `BaseDendrite` (#3016)
Preparations to actually remove/replace `BaseDendrite`.
Quite a few changes:
- SyncAPI accepts an `fulltext.Indexer` interface (fulltext is removed
from `BaseDendrite`)
- Caches are removed from `BaseDendrite`
- Introduces a `Router` struct (likely to change)
- also fixes #2903
- Introduces a `sqlutil.ConnectionManager`, which should remove
`base.DatabaseConnection` later on
- probably more
Diffstat (limited to 'syncapi/routing')
| -rw-r--r-- | syncapi/routing/routing.go | 2 | ||||
| -rw-r--r-- | syncapi/routing/search.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/syncapi/routing/routing.go b/syncapi/routing/routing.go index 4cc1a6a8..b1283247 100644 --- a/syncapi/routing/routing.go +++ b/syncapi/routing/routing.go @@ -43,7 +43,7 @@ func Setup( rsAPI api.SyncRoomserverAPI, cfg *config.SyncAPI, lazyLoadCache caching.LazyLoadCache, - fts *fulltext.Search, + fts fulltext.Indexer, ) { v1unstablemux := csMux.PathPrefix("/{apiversion:(?:v1|unstable)}/").Subrouter() v3mux := csMux.PathPrefix("/{apiversion:(?:r0|v3)}/").Subrouter() diff --git a/syncapi/routing/search.go b/syncapi/routing/search.go index 081ec6cb..13625b9c 100644 --- a/syncapi/routing/search.go +++ b/syncapi/routing/search.go @@ -37,7 +37,7 @@ import ( ) // nolint:gocyclo -func Search(req *http.Request, device *api.Device, syncDB storage.Database, fts *fulltext.Search, from *string) util.JSONResponse { +func Search(req *http.Request, device *api.Device, syncDB storage.Database, fts fulltext.Indexer, from *string) util.JSONResponse { start := time.Now() var ( searchReq SearchRequest |