diff --git a/.env b/.env index c0a900f13..b4aa007c3 100644 --- a/.env +++ b/.env @@ -11,7 +11,6 @@ CLOUDFLARE_INTEGRATION=false DATABASE_URL=postgresql://labrinth:labrinth@localhost/labrinth DATABASE_MIN_CONNECTIONS=0 DATABASE_MAX_CONNECTIONS=16 - MEILISEARCH_ADDR=http://localhost:7700 MEILISEARCH_KEY=modrinth diff --git a/src/routes/admin.rs b/src/routes/admin.rs index 8804c100b..45b9ce73b 100644 --- a/src/routes/admin.rs +++ b/src/routes/admin.rs @@ -11,7 +11,7 @@ pub struct DownloadBody { // This is an internal route, cannot be used without key #[patch("/_count-download", guard = "admin_key_guard")] -pub async fn version_count_patch( +pub async fn count_download( pool: web::Data, download_body: web::Json, ) -> Result { diff --git a/src/routes/mod.rs b/src/routes/mod.rs index 899b36d9c..063dde34f 100644 --- a/src/routes/mod.rs +++ b/src/routes/mod.rs @@ -40,7 +40,8 @@ pub fn v2_config(cfg: &mut web::ServiceConfig) { .configure(users_config) .configure(moderation_config) .configure(reports_config) - .configure(notifications_config), + .configure(notifications_config) + .configure(admin_config), ); } @@ -156,6 +157,13 @@ pub fn reports_config(cfg: &mut web::ServiceConfig) { cfg.service(reports::delete_report); } +pub fn admin_config(cfg: &mut web::ServiceConfig) { + cfg.service( + web::scope("admin") + .service(admin::count_download) + ); +} + #[derive(thiserror::Error, Debug)] pub enum ApiError { #[error("Environment Error")] diff --git a/src/search/mod.rs b/src/search/mod.rs index c4ddee98b..84facfb47 100644 --- a/src/search/mod.rs +++ b/src/search/mod.rs @@ -160,8 +160,8 @@ pub async fn search_for_project( "relevance" => ("projects", ["downloads:desc"]), "downloads" => ("projects_filtered", ["downloads:desc"]), "follows" => ("projects_filtered", ["follows:desc"]), - "updated" => ("projects_filtered", ["date_created:asc"]), - "newest" => ("projects_filtered", ["date_modified:asc"]), + "updated" => ("projects_filtered", ["date_modified:desc"]), + "newest" => ("projects_filtered", ["date_created:desc"]), i => return Err(SearchError::InvalidIndex(i.to_string())), };