diff --git a/sqlx-data.json b/sqlx-data.json index 07e830fe9..003f8eb4e 100644 --- a/sqlx-data.json +++ b/sqlx-data.json @@ -151,8 +151,8 @@ "nullable": [] } }, - "04e8a626bf8e210ab36f2531d63e09583fc431db7818957d69b10d966670a3e6": { - "query": "\n SELECT m.id FROM mods m\n INNER JOIN team_members tm ON tm.team_id = m.team_id\n WHERE tm.user_id = $1 AND m.status = (SELECT s.id FROM statuses s WHERE s.status = $2)\n ", + "06c2d67bcbc95baa4b7e5865ec9adec7f068c1dfd3f859c29465b8d8a40343e0": { + "query": "\n SELECT m.id FROM mods m\n INNER JOIN team_members tm ON tm.team_id = m.team_id AND tm.accepted = TRUE\n WHERE tm.user_id = $1\n ", "describe": { "columns": [ { @@ -163,8 +163,7 @@ ], "parameters": { "Left": [ - "Int8", - "Text" + "Int8" ] }, "nullable": [ @@ -235,147 +234,6 @@ ] } }, - "0bea37e9f2c4c962633fd3359702974962d9f264593bc603c72da5bc7ddff4c4": { - "query": "\n SELECT m.id id, m.project_type project_type, m.title title, m.description description, m.downloads downloads, m.follows follows,\n m.icon_url icon_url, m.published published,\n m.updated updated,\n m.team_id team_id, m.license license, m.slug slug,\n s.status status_name, cs.name client_side_type, ss.name server_side_type, l.short short, pt.name project_type_name, u.username username,\n STRING_AGG(DISTINCT c.category, ',') categories, STRING_AGG(DISTINCT lo.loader, ',') loaders, STRING_AGG(DISTINCT gv.version, ',') versions\n FROM mods m\n LEFT OUTER JOIN mods_categories mc ON joining_mod_id = m.id\n LEFT OUTER JOIN categories c ON mc.joining_category_id = c.id\n LEFT OUTER JOIN versions v ON v.mod_id = m.id\n INNER JOIN statuses s ON s.id = m.status\n INNER JOIN game_versions_versions gvv ON gvv.joining_version_id = v.id\n INNER JOIN game_versions gv ON gvv.game_version_id = gv.id\n INNER JOIN loaders_versions lv ON lv.version_id = v.id\n INNER JOIN loaders lo ON lo.id = lv.loader_id\n INNER JOIN project_types pt ON pt.id = m.project_type\n INNER JOIN side_types cs ON m.client_side = cs.id\n INNER JOIN side_types ss ON m.server_side = ss.id\n INNER JOIN licenses l ON m.license = l.id\n INNER JOIN team_members tm ON tm.team_id = m.team_id AND tm.role = $2\n INNER JOIN users u ON tm.user_id = u.id\n WHERE s.status = $1\n GROUP BY m.id, s.id, cs.id, ss.id, l.id, pt.id, u.id;\n ", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "id", - "type_info": "Int8" - }, - { - "ordinal": 1, - "name": "project_type", - "type_info": "Int4" - }, - { - "ordinal": 2, - "name": "title", - "type_info": "Varchar" - }, - { - "ordinal": 3, - "name": "description", - "type_info": "Varchar" - }, - { - "ordinal": 4, - "name": "downloads", - "type_info": "Int4" - }, - { - "ordinal": 5, - "name": "follows", - "type_info": "Int4" - }, - { - "ordinal": 6, - "name": "icon_url", - "type_info": "Varchar" - }, - { - "ordinal": 7, - "name": "published", - "type_info": "Timestamptz" - }, - { - "ordinal": 8, - "name": "updated", - "type_info": "Timestamptz" - }, - { - "ordinal": 9, - "name": "team_id", - "type_info": "Int8" - }, - { - "ordinal": 10, - "name": "license", - "type_info": "Int4" - }, - { - "ordinal": 11, - "name": "slug", - "type_info": "Varchar" - }, - { - "ordinal": 12, - "name": "status_name", - "type_info": "Varchar" - }, - { - "ordinal": 13, - "name": "client_side_type", - "type_info": "Varchar" - }, - { - "ordinal": 14, - "name": "server_side_type", - "type_info": "Varchar" - }, - { - "ordinal": 15, - "name": "short", - "type_info": "Varchar" - }, - { - "ordinal": 16, - "name": "project_type_name", - "type_info": "Varchar" - }, - { - "ordinal": 17, - "name": "username", - "type_info": "Varchar" - }, - { - "ordinal": 18, - "name": "categories", - "type_info": "Text" - }, - { - "ordinal": 19, - "name": "loaders", - "type_info": "Text" - }, - { - "ordinal": 20, - "name": "versions", - "type_info": "Text" - } - ], - "parameters": { - "Left": [ - "Text", - "Text" - ] - }, - "nullable": [ - false, - false, - false, - false, - false, - false, - true, - false, - false, - false, - false, - true, - false, - false, - false, - false, - false, - false, - null, - null, - null - ] - } - }, "0ca11a32b2860e4f5c3d20892a5be3cb419e084f42ba0f98e09b9995027fcc4e": { "query": "\n SELECT id FROM statuses\n WHERE status = $1\n ", "describe": { @@ -941,6 +799,26 @@ ] } }, + "1d6f3e926fc4a27c5af172f672b7f825f9f5fe2d538b06337ef182ab1a553398": { + "query": "\n SELECT name FROM project_types pt\n INNER JOIN mods ON mods.project_type = pt.id\n WHERE mods.id = $1\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "name", + "type_info": "Varchar" + } + ], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [ + false + ] + } + }, "1db6be78a74ff04c52ee105e0df30acf5bbf18f1de328980bb7f3da7f5f6569e": { "query": "\n SELECT id FROM side_types\n WHERE name = $1\n ", "describe": { @@ -1043,26 +921,6 @@ ] } }, - "21ef50f46b7b3e62b91e7d067c1cb33806e14c33bb76d63c2711f822c44261f6": { - "query": "\n SELECT name FROM project_types pt\n INNER JOIN mods ON mods.project_type = pt.id\n WHERE mods.id = $1\n ", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "name", - "type_info": "Varchar" - } - ], - "parameters": { - "Left": [ - "Int8" - ] - }, - "nullable": [ - false - ] - } - }, "24e5daad907eec54505274f93952d5c20f4bbdd3f771eb0a2fdfa6324768df39": { "query": "\n SELECT short, name FROM licenses\n WHERE id = $1\n ", "describe": { @@ -1852,6 +1710,27 @@ ] } }, + "4ccf5373d9593fd19622dba270ae2b194f8029f2fb05ad00ff6b3f2ac4d589b0": { + "query": "\n SELECT m.id FROM mods m\n INNER JOIN team_members tm ON tm.team_id = m.team_id AND tm.accepted = TRUE\n WHERE tm.user_id = $1 AND m.status = (SELECT s.id FROM statuses s WHERE s.status = $2)\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": "Int8" + } + ], + "parameters": { + "Left": [ + "Int8", + "Text" + ] + }, + "nullable": [ + false + ] + } + }, "4e9f9eafbfd705dfc94571018cb747245a98ea61bad3fae4b3ce284229d99955": { "query": "\n UPDATE mods\n SET description = $1\n WHERE (id = $2)\n ", "describe": { @@ -2028,8 +1907,8 @@ ] } }, - "57d2a9f3dd9377fa7435deed1e09c474e447d7e502004556e239b6c2984e259b": { - "query": "\n SELECT m.id id, m.project_type project_type, m.title title, m.description description, m.downloads downloads, m.follows follows,\n m.icon_url icon_url, m.published published,\n m.updated updated,\n m.team_id team_id, m.license license, m.slug slug,\n s.status status_name, cs.name client_side_type, ss.name server_side_type, l.short short, pt.name project_type_name, u.username username,\n STRING_AGG(DISTINCT c.category, ',') categories, STRING_AGG(DISTINCT lo.loader, ',') loaders, STRING_AGG(DISTINCT gv.version, ',') versions\n FROM mods m\n LEFT OUTER JOIN mods_categories mc ON joining_mod_id = m.id\n LEFT OUTER JOIN categories c ON mc.joining_category_id = c.id\n LEFT OUTER JOIN versions v ON v.mod_id = m.id\n INNER JOIN statuses s ON s.id = m.status\n INNER JOIN game_versions_versions gvv ON gvv.joining_version_id = v.id\n INNER JOIN game_versions gv ON gvv.game_version_id = gv.id\n INNER JOIN loaders_versions lv ON lv.version_id = v.id\n INNER JOIN loaders lo ON lo.id = lv.loader_id\n INNER JOIN project_types pt ON pt.id = m.project_type\n INNER JOIN side_types cs ON m.client_side = cs.id\n INNER JOIN side_types ss ON m.server_side = ss.id\n INNER JOIN licenses l ON m.license = l.id\n INNER JOIN team_members tm ON tm.team_id = m.team_id AND tm.role = $2\n INNER JOIN users u ON tm.user_id = u.id\n WHERE m.id = $1\n GROUP BY m.id, s.id, cs.id, ss.id, l.id, pt.id, u.id;\n ", + "57c4609659459323d26e5f7d6cb24d1aaea1ca839998c276bcd5d9e9330568a1": { + "query": "\n SELECT m.id id, m.project_type project_type, m.title title, m.description description, m.downloads downloads, m.follows follows,\n m.icon_url icon_url, m.published published,\n m.updated updated,\n m.team_id team_id, m.license license, m.slug slug,\n s.status status_name, cs.name client_side_type, ss.name server_side_type, l.short short, pt.name project_type_name, u.username username,\n STRING_AGG(DISTINCT c.category, ',') categories, STRING_AGG(DISTINCT lo.loader, ',') loaders, STRING_AGG(DISTINCT gv.version, ',') versions\n FROM mods m\n LEFT OUTER JOIN mods_categories mc ON joining_mod_id = m.id\n LEFT OUTER JOIN categories c ON mc.joining_category_id = c.id\n LEFT OUTER JOIN versions v ON v.mod_id = m.id\n LEFT OUTER JOIN game_versions_versions gvv ON gvv.joining_version_id = v.id\n LEFT OUTER JOIN game_versions gv ON gvv.game_version_id = gv.id\n LEFT OUTER JOIN loaders_versions lv ON lv.version_id = v.id\n LEFT OUTER JOIN loaders lo ON lo.id = lv.loader_id\n INNER JOIN statuses s ON s.id = m.status\n INNER JOIN project_types pt ON pt.id = m.project_type\n INNER JOIN side_types cs ON m.client_side = cs.id\n INNER JOIN side_types ss ON m.server_side = ss.id\n INNER JOIN licenses l ON m.license = l.id\n INNER JOIN team_members tm ON tm.team_id = m.team_id AND tm.role = $2\n INNER JOIN users u ON tm.user_id = u.id\n WHERE m.id = $1\n GROUP BY m.id, s.id, cs.id, ss.id, l.id, pt.id, u.id;\n ", "describe": { "columns": [ { @@ -3147,6 +3026,147 @@ ] } }, + "86bc6fc06bc768cf5071cb9d5131c1f32a83e369bb096d759c60841ca6e68eb8": { + "query": "\n SELECT m.id id, m.project_type project_type, m.title title, m.description description, m.downloads downloads, m.follows follows,\n m.icon_url icon_url, m.published published,\n m.updated updated,\n m.team_id team_id, m.license license, m.slug slug,\n s.status status_name, cs.name client_side_type, ss.name server_side_type, l.short short, pt.name project_type_name, u.username username,\n STRING_AGG(DISTINCT c.category, ',') categories, STRING_AGG(DISTINCT lo.loader, ',') loaders, STRING_AGG(DISTINCT gv.version, ',') versions\n FROM mods m\n LEFT OUTER JOIN mods_categories mc ON joining_mod_id = m.id\n LEFT OUTER JOIN categories c ON mc.joining_category_id = c.id\n LEFT OUTER JOIN versions v ON v.mod_id = m.id\n LEFT OUTER JOIN game_versions_versions gvv ON gvv.joining_version_id = v.id\n LEFT OUTER JOIN game_versions gv ON gvv.game_version_id = gv.id\n LEFT OUTER JOIN loaders_versions lv ON lv.version_id = v.id\n LEFT OUTER JOIN loaders lo ON lo.id = lv.loader_id\n INNER JOIN statuses s ON s.id = m.status\n INNER JOIN project_types pt ON pt.id = m.project_type\n INNER JOIN side_types cs ON m.client_side = cs.id\n INNER JOIN side_types ss ON m.server_side = ss.id\n INNER JOIN licenses l ON m.license = l.id\n INNER JOIN team_members tm ON tm.team_id = m.team_id AND tm.role = $2\n INNER JOIN users u ON tm.user_id = u.id\n WHERE s.status = $1\n GROUP BY m.id, s.id, cs.id, ss.id, l.id, pt.id, u.id;\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": "Int8" + }, + { + "ordinal": 1, + "name": "project_type", + "type_info": "Int4" + }, + { + "ordinal": 2, + "name": "title", + "type_info": "Varchar" + }, + { + "ordinal": 3, + "name": "description", + "type_info": "Varchar" + }, + { + "ordinal": 4, + "name": "downloads", + "type_info": "Int4" + }, + { + "ordinal": 5, + "name": "follows", + "type_info": "Int4" + }, + { + "ordinal": 6, + "name": "icon_url", + "type_info": "Varchar" + }, + { + "ordinal": 7, + "name": "published", + "type_info": "Timestamptz" + }, + { + "ordinal": 8, + "name": "updated", + "type_info": "Timestamptz" + }, + { + "ordinal": 9, + "name": "team_id", + "type_info": "Int8" + }, + { + "ordinal": 10, + "name": "license", + "type_info": "Int4" + }, + { + "ordinal": 11, + "name": "slug", + "type_info": "Varchar" + }, + { + "ordinal": 12, + "name": "status_name", + "type_info": "Varchar" + }, + { + "ordinal": 13, + "name": "client_side_type", + "type_info": "Varchar" + }, + { + "ordinal": 14, + "name": "server_side_type", + "type_info": "Varchar" + }, + { + "ordinal": 15, + "name": "short", + "type_info": "Varchar" + }, + { + "ordinal": 16, + "name": "project_type_name", + "type_info": "Varchar" + }, + { + "ordinal": 17, + "name": "username", + "type_info": "Varchar" + }, + { + "ordinal": 18, + "name": "categories", + "type_info": "Text" + }, + { + "ordinal": 19, + "name": "loaders", + "type_info": "Text" + }, + { + "ordinal": 20, + "name": "versions", + "type_info": "Text" + } + ], + "parameters": { + "Left": [ + "Text", + "Text" + ] + }, + "nullable": [ + false, + false, + false, + false, + false, + false, + true, + false, + false, + false, + false, + true, + false, + false, + false, + false, + false, + false, + null, + null, + null + ] + } + }, "87fd169e19ba231c6cf131ad2841d5c3b95adde53e5ed4000f8e7d54c0e87320": { "query": "\n DELETE FROM project_types\n WHERE name = $1\n ", "describe": { @@ -5651,26 +5671,6 @@ ] } }, - "fdb2a6ea649bb23c69af5c756d6137e216603708ffccd4e9162fb1c9765a56aa": { - "query": "\n SELECT m.id FROM mods m\n INNER JOIN team_members tm ON tm.team_id = m.team_id\n WHERE tm.user_id = $1\n ", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "id", - "type_info": "Int8" - } - ], - "parameters": { - "Left": [ - "Int8" - ] - }, - "nullable": [ - false - ] - } - }, "fe73b6928f13955840e8df248688908fb6d82dd1d35dc803676639a6e0864ed5": { "query": "\n DELETE FROM downloads\n WHERE date < (CURRENT_DATE - INTERVAL '30 minutes ago')\n ", "describe": { diff --git a/src/database/models/categories.rs b/src/database/models/categories.rs index 4ffc477ec..96bbb9b3c 100644 --- a/src/database/models/categories.rs +++ b/src/database/models/categories.rs @@ -1128,7 +1128,7 @@ impl ProjectType { } pub async fn get_many_id<'a, E>( - names: &Vec, + names: &[String], exec: E, ) -> Result, sqlx::Error> where diff --git a/src/database/models/team_item.rs b/src/database/models/team_item.rs index c6be4dd2c..22507fe6a 100644 --- a/src/database/models/team_item.rs +++ b/src/database/models/team_item.rs @@ -173,7 +173,7 @@ impl TeamMember { permissions: perms, accepted: m.accepted, user: User { - id: UserId(m.id), + id: UserId(m.user_id), github_id: m.github_id, name: m.user_name, email: m.email, diff --git a/src/database/models/user_item.rs b/src/database/models/user_item.rs index d0932103b..e1d715a2c 100644 --- a/src/database/models/user_item.rs +++ b/src/database/models/user_item.rs @@ -199,7 +199,7 @@ impl User { let projects = sqlx::query!( " SELECT m.id FROM mods m - INNER JOIN team_members tm ON tm.team_id = m.team_id + INNER JOIN team_members tm ON tm.team_id = m.team_id AND tm.accepted = TRUE WHERE tm.user_id = $1 AND m.status = (SELECT s.id FROM statuses s WHERE s.status = $2) ", user_id as UserId, @@ -225,7 +225,7 @@ impl User { let projects = sqlx::query!( " SELECT m.id FROM mods m - INNER JOIN team_members tm ON tm.team_id = m.team_id + INNER JOIN team_members tm ON tm.team_id = m.team_id AND tm.accepted = TRUE WHERE tm.user_id = $1 ", user_id as UserId, diff --git a/src/routes/project_creation.rs b/src/routes/project_creation.rs index dd79314b8..ccc527748 100644 --- a/src/routes/project_creation.rs +++ b/src/routes/project_creation.rs @@ -291,6 +291,7 @@ pub async fn project_create_inner( let mut versions_map = std::collections::HashMap::new(); let all_game_versions = models::categories::GameVersion::list(&mut *transaction).await?; + let all_loaders = models::categories::Loader::list(&mut *transaction).await?; { // The first multipart field must be named "data" and contain a @@ -365,6 +366,8 @@ pub async fn project_create_inner( project_id, current_user.id, &all_game_versions, + &all_loaders, + &create_data.project_type, transaction, ) .await?, @@ -630,6 +633,8 @@ async fn create_initial_version( project_id: ProjectId, author: UserId, all_game_versions: &[models::categories::GameVersion], + all_loaders: &[models::categories::Loader], + project_type: &str, transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>, ) -> Result { if version_data.project_id.is_some() { @@ -660,13 +665,21 @@ async fn create_initial_version( }) .collect::, CreateError>>()?; - let mut loaders = Vec::with_capacity(version_data.loaders.len()); - for l in &version_data.loaders { - let id = models::categories::Loader::get_id(&l.0, &mut *transaction) - .await? - .ok_or_else(|| CreateError::InvalidLoader(l.0.clone()))?; - loaders.push(id); - } + let loaders = version_data + .loaders + .iter() + .map(|x| { + all_loaders + .iter() + .find(|y| { + y.loader == x.0 + && y.supported_project_types + .contains(&project_type.to_string()) + }) + .ok_or_else(|| CreateError::InvalidLoader(x.0.clone())) + .map(|y| y.id) + }) + .collect::, CreateError>>()?; let dependencies = version_data .dependencies diff --git a/src/routes/tags.rs b/src/routes/tags.rs index ddb1b3cfa..8e345f767 100644 --- a/src/routes/tags.rs +++ b/src/routes/tags.rs @@ -64,14 +64,12 @@ pub async fn category_create( ) -> Result { check_is_admin_from_headers(req.headers(), &**pool).await?; - let project_type = crate::database::models::ProjectTypeId::get_id( - (&new_category).project_type.clone(), - &**pool, - ) - .await? - .ok_or_else(|| { - ApiError::InvalidInputError("Specified project type does not exist!".to_string()) - })?; + let project_type = + crate::database::models::ProjectTypeId::get_id(new_category.project_type.clone(), &**pool) + .await? + .ok_or_else(|| { + ApiError::InvalidInputError("Specified project type does not exist!".to_string()) + })?; let _id = Category::builder() .name(&new_category.name)? diff --git a/src/routes/users.rs b/src/routes/users.rs index 98d15b54d..6e8af994e 100644 --- a/src/routes/users.rs +++ b/src/routes/users.rs @@ -478,13 +478,15 @@ pub async fn user_notifications( )); } - let notifications: Vec = + let mut notifications: Vec = crate::database::models::notification_item::Notification::get_many_user(id, &**pool) .await? .into_iter() .map(convert_notification) .collect(); + notifications.sort_by(|a, b| b.created.cmp(&a.created)); + Ok(HttpResponse::Ok().json(notifications)) } else { Ok(HttpResponse::NotFound().body("")) diff --git a/src/routes/v1/tags.rs b/src/routes/v1/tags.rs index cbc8fd859..deb4aebb4 100644 --- a/src/routes/v1/tags.rs +++ b/src/routes/v1/tags.rs @@ -13,7 +13,7 @@ pub async fn category_list(pool: web::Data) -> Result>(); Ok(HttpResponse::Ok().json(results)) } @@ -67,8 +67,7 @@ pub async fn loader_create( let name = loader.into_inner().0; let mut transaction = pool.begin().await?; - let project_types = - ProjectType::get_many_id(&vec!["mod".to_string()], &mut *transaction).await?; + let project_types = ProjectType::get_many_id(&["mod".to_string()], &mut *transaction).await?; let _id = Loader::builder() .name(&name)? diff --git a/src/routes/version_creation.rs b/src/routes/version_creation.rs index fbabc2a16..b31b4f40a 100644 --- a/src/routes/version_creation.rs +++ b/src/routes/version_creation.rs @@ -99,6 +99,7 @@ async fn version_create_inner( let mut version_builder = None; let all_game_versions = models::categories::GameVersion::list(&mut *transaction).await?; + let all_loaders = models::categories::Loader::list(&mut *transaction).await?; let user = get_user_from_headers(req.headers(), &mut *transaction).await?; @@ -192,6 +193,18 @@ async fn version_create_inner( .await? .expect("Release channel not found in database"); + let project_type = sqlx::query!( + " + SELECT name FROM project_types pt + INNER JOIN mods ON mods.project_type = pt.id + WHERE mods.id = $1 + ", + project_id as models::ProjectId, + ) + .fetch_one(&mut *transaction) + .await? + .name; + let game_versions = version_create_data .game_versions .iter() @@ -204,13 +217,19 @@ async fn version_create_inner( }) .collect::, CreateError>>()?; - let mut loaders = Vec::with_capacity(version_create_data.loaders.len()); - for l in &version_create_data.loaders { - let id = models::categories::Loader::get_id(&l.0, &mut *transaction) - .await? - .ok_or_else(|| CreateError::InvalidLoader(l.0.clone()))?; - loaders.push(id); - } + let loaders = version_create_data + .loaders + .iter() + .map(|x| { + all_loaders + .iter() + .find(|y| { + y.loader == x.0 && y.supported_project_types.contains(&project_type) + }) + .ok_or_else(|| CreateError::InvalidLoader(x.0.clone())) + .map(|y| y.id) + }) + .collect::, CreateError>>()?; let dependencies = version_create_data .dependencies @@ -245,10 +264,10 @@ async fn version_create_inner( let project_type = sqlx::query!( " - SELECT name FROM project_types pt - INNER JOIN mods ON mods.project_type = pt.id - WHERE mods.id = $1 - ", + SELECT name FROM project_types pt + INNER JOIN mods ON mods.project_type = pt.id + WHERE mods.id = $1 + ", version.project_id as models::ProjectId, ) .fetch_one(&mut *transaction) diff --git a/src/search/indexing/local_import.rs b/src/search/indexing/local_import.rs index 6d3d7424b..d3a772b85 100644 --- a/src/search/indexing/local_import.rs +++ b/src/search/indexing/local_import.rs @@ -23,11 +23,11 @@ pub async fn index_local(pool: PgPool) -> Result, Index LEFT OUTER JOIN mods_categories mc ON joining_mod_id = m.id LEFT OUTER JOIN categories c ON mc.joining_category_id = c.id LEFT OUTER JOIN versions v ON v.mod_id = m.id + LEFT OUTER JOIN game_versions_versions gvv ON gvv.joining_version_id = v.id + LEFT OUTER JOIN game_versions gv ON gvv.game_version_id = gv.id + LEFT OUTER JOIN loaders_versions lv ON lv.version_id = v.id + LEFT OUTER JOIN loaders lo ON lo.id = lv.loader_id INNER JOIN statuses s ON s.id = m.status - INNER JOIN game_versions_versions gvv ON gvv.joining_version_id = v.id - INNER JOIN game_versions gv ON gvv.game_version_id = gv.id - INNER JOIN loaders_versions lv ON lv.version_id = v.id - INNER JOIN loaders lo ON lo.id = lv.loader_id INNER JOIN project_types pt ON pt.id = m.project_type INNER JOIN side_types cs ON m.client_side = cs.id INNER JOIN side_types ss ON m.server_side = ss.id @@ -94,11 +94,11 @@ pub async fn query_one( LEFT OUTER JOIN mods_categories mc ON joining_mod_id = m.id LEFT OUTER JOIN categories c ON mc.joining_category_id = c.id LEFT OUTER JOIN versions v ON v.mod_id = m.id + LEFT OUTER JOIN game_versions_versions gvv ON gvv.joining_version_id = v.id + LEFT OUTER JOIN game_versions gv ON gvv.game_version_id = gv.id + LEFT OUTER JOIN loaders_versions lv ON lv.version_id = v.id + LEFT OUTER JOIN loaders lo ON lo.id = lv.loader_id INNER JOIN statuses s ON s.id = m.status - INNER JOIN game_versions_versions gvv ON gvv.joining_version_id = v.id - INNER JOIN game_versions gv ON gvv.game_version_id = gv.id - INNER JOIN loaders_versions lv ON lv.version_id = v.id - INNER JOIN loaders lo ON lo.id = lv.loader_id INNER JOIN project_types pt ON pt.id = m.project_type INNER JOIN side_types cs ON m.client_side = cs.id INNER JOIN side_types ss ON m.server_side = ss.id diff --git a/src/search/indexing/mod.rs b/src/search/indexing/mod.rs index 61fef63ea..c2c542c1f 100644 --- a/src/search/indexing/mod.rs +++ b/src/search/indexing/mod.rs @@ -71,7 +71,6 @@ pub async fn reset_indices(config: &SearchConfig) -> Result<(), IndexingError> { client.delete_index("follows_projects").await?; client.delete_index("updated_projects").await?; client.delete_index("newest_projects").await?; - client.delete_index("alphabetically_projects").await?; Ok(()) } @@ -102,14 +101,6 @@ pub async fn reconfigure_indices(config: &SearchConfig) -> Result<(), IndexingEr }) .await?; - // Alphabetically Index - update_index(&client, "alphabetically_projects", { - let mut alphabetically_rules = default_rules(); - alphabetically_rules.push_front("desc(title)".to_string()); - alphabetically_rules.into() - }) - .await?; - // Updated Index update_index(&client, "updated_projects", { let mut updated_rules = default_rules(); @@ -218,15 +209,6 @@ pub async fn add_projects( .await?; add_to_index(follows_index, &projects).await?; - // Alphabetically Index - let alphabetically_index = create_index(&client, "alphabetically_projects", || { - let mut alphabetically_rules = default_rules(); - alphabetically_rules.push_front("desc(title)".to_string()); - alphabetically_rules.into() - }) - .await?; - add_to_index(alphabetically_index, &projects).await?; - // Updated Index let updated_index = create_index(&client, "updated_projects", || { let mut updated_rules = default_rules(); @@ -305,6 +287,7 @@ fn default_settings() -> Settings { String::from("license"), String::from("client_side"), String::from("server_side"), + String::from("project_type"), ]) } diff --git a/src/search/mod.rs b/src/search/mod.rs index b5165c4d9..a0e280062 100644 --- a/src/search/mod.rs +++ b/src/search/mod.rs @@ -158,7 +158,6 @@ pub async fn search_for_project( "follows" => "follows_projects", "updated" => "updated_projects", "newest" => "newest_projects", - "alphabetically" => "alphabetically_projects", i => return Err(SearchError::InvalidIndex(i.to_string())), };