Bommels05/Modrinth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix search rules, register download route (#346)

Browse Source
This commit is contained in:
Geometrically 2022-05-11 18:09:29 -04:00 committed by GitHub
parent 26d9ef5398
commit 3533d2a2cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env
View File

@ -11,7 +11,6 @@ CLOUDFLARE_INTEGRATION=false
DATABASE_URL=postgresql://labrinth:labrinth@localhost/labrinth DATABASE_URL=postgresql://labrinth:labrinth@localhost/labrinth
DATABASE_MIN_CONNECTIONS=0 DATABASE_MIN_CONNECTIONS=0
DATABASE_MAX_CONNECTIONS=16 DATABASE_MAX_CONNECTIONS=16
MEILISEARCH_ADDR=http://localhost:7700 MEILISEARCH_ADDR=http://localhost:7700
MEILISEARCH_KEY=modrinth MEILISEARCH_KEY=modrinth

2
src/routes/admin.rs
View File

@ -11,7 +11,7 @@ pub struct DownloadBody {
// This is an internal route, cannot be used without key // This is an internal route, cannot be used without key
#[patch("/_count-download", guard = "admin_key_guard")] #[patch("/_count-download", guard = "admin_key_guard")]
pub async fn version_count_patch( pub async fn count_download(
pool: web::Data<PgPool>, pool: web::Data<PgPool>,
download_body: web::Json<DownloadBody>, download_body: web::Json<DownloadBody>,
) -> Result<HttpResponse, ApiError> { ) -> Result<HttpResponse, ApiError> {

10
src/routes/mod.rs
View File

@ -40,7 +40,8 @@ pub fn v2_config(cfg: &mut web::ServiceConfig) {
.configure(users_config) .configure(users_config)
.configure(moderation_config) .configure(moderation_config)
.configure(reports_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); 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)] #[derive(thiserror::Error, Debug)]
pub enum ApiError { pub enum ApiError {
#[error("Environment Error")] #[error("Environment Error")]

4
src/search/mod.rs
View File

@ -160,8 +160,8 @@ pub async fn search_for_project(
"relevance" => ("projects", ["downloads:desc"]), "relevance" => ("projects", ["downloads:desc"]),
"downloads" => ("projects_filtered", ["downloads:desc"]), "downloads" => ("projects_filtered", ["downloads:desc"]),
"follows" => ("projects_filtered", ["follows:desc"]), "follows" => ("projects_filtered", ["follows:desc"]),
"updated" => ("projects_filtered", ["date_created:asc"]), "updated" => ("projects_filtered", ["date_modified:desc"]),
"newest" => ("projects_filtered", ["date_modified:asc"]), "newest" => ("projects_filtered", ["date_created:desc"]),
i => return Err(SearchError::InvalidIndex(i.to_string())), i => return Err(SearchError::InvalidIndex(i.to_string())),
}; };