synthetic server project version for search indexing

Author: aecsocket

…ae8987441bb5e89c9ea62d347e47899e3c2.json …74fc472ec160a673abeeee10c778b9cf23f.jsonapps/labrinth/.sqlx/query-702a2826d5857dc51b1a7a79c9043ae8987441bb5e89c9ea62d347e47899e3c2.json renamed to apps/labrinth/.sqlx/query-b760951120c1885530f3fb8208a5874fc472ec160a673abeeee10c778b9cf23f.json apps/labrinth/.sqlx/query-702a2826d5857dc51b1a7a79c9043ae8987441bb5e89c9ea62d347e47899e3c2.json renamed to apps/labrinth/.sqlx/query-b760951120c1885530f3fb8208a5874fc472ec160a673abeeee10c778b9cf23f.json

@@ -837,7 +837,7 @@ impl DBProject {
                         let project_id = DBProjectId(id);
                         let VersionLoaderData {
                             loaders,
-                            project_types,
+                            mut project_types,
                             games,
                             loader_loader_field_ids,
                         } = loaders_ptypes_games.remove(&project_id).map(|x|x.1).unwrap_or_default();
@@ -852,6 +852,11 @@ impl DBProject {
                             .filter(|x| loader_loader_field_ids.contains(&x.id))
                             .collect::<Vec<_>>();
 
+                        exp::compat::correct_project_types(
+                            &m.components,
+                            &mut project_types,
+                        );
+
                         let project = ProjectQueryResult {
                             inner: DBProject {
                                 id: DBProjectId(id),

apps/labrinth/src/database/models/project_item.rs

@@ -0,0 +1,20 @@
+//! Compatibility utilities for V3 API.
+
+use crate::models::exp::ProjectSerial;
+
+const MINECRAFT_JAVA_SERVER: &str = "minecraft_java_server";
+
+/// Adjusts V3 project types based on a project's components.
+///
+/// The experimental API does not have a concept of project types; instead, a
+/// project's "type" is implicit based on what components it has.
+/// To reflect this in the V3 API, we manually add `project_types` values
+/// for compatibility with stuff like searching.
+pub fn correct_project_types(
+    components: &ProjectSerial,
+    project_types: &mut Vec<String>,
+) {
+    if components.minecraft_server.is_some() {
+        project_types.push(MINECRAFT_JAVA_SERVER.into());
+    }
+}

apps/labrinth/src/models/exp/compat.rs

@@ -190,7 +190,11 @@ pub struct JavaServerPing {
 /// Ping response data for a Minecraft Java server.
 #[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
 pub struct JavaServerPingData {
-    /// How long it took to ping the server.
+    /// How long it took for the Labrinth worker to ping the server.
+    ///
+    /// Note: this is explicitly *not* a client-side ping time, so this should
+    /// not be used to display to a client how much latency they have to a
+    /// specific server. This is purely for internal metrics.
     pub latency: Duration,
     /// Reported version name of the server.
     pub version_name: String,

apps/labrinth/src/models/exp/minecraft.rs

@@ -18,6 +18,7 @@ use serde::{Deserialize, Serialize};
 use validator::Validate;
 
 pub mod base;
+pub mod compat;
 pub mod component;
 pub mod minecraft;
 

apps/labrinth/src/models/exp/mod.rs

@@ -11,14 +11,17 @@ use crate::{
         models::{
             self, DBOrganization, DBTeamMember, DBUser,
             project_item::ProjectBuilder, thread_item::ThreadBuilder,
+            version_item::VersionBuilder,
         },
         redis::RedisPool,
     },
     models::{
         exp::{self, ProjectComponentKind, component::ComponentRelationError},
         ids::ProjectId,
         pats::Scopes,
-        projects::{MonetizationStatus, ProjectStatus},
+        projects::{
+            MonetizationStatus, ProjectStatus, VersionStatus, VersionType,
+        },
         teams::{OrganizationPermissions, ProjectPermissions},
         threads::ThreadType,
         v3::user_limits::UserLimits,
@@ -233,12 +236,44 @@ pub async fn create(
         .wrap_internal_err("failed to generate project ID")?
         .into();
 
-    // TODO: special-case server projects to be unmonetized
-    let monetization_status = if details.minecraft_server.is_some() {
-        MonetizationStatus::ForceDemonetized
-    } else {
-        MonetizationStatus::Monetized
-    };
+    // TODO: special casing certain components
+    let mut monetization_status = MonetizationStatus::Monetized;
+    let mut version_builder = None::<VersionBuilder>;
+
+    if details.minecraft_server.is_some() {
+        // servers are not part of the monetization pool;
+        // they generate no payouts for their owners
+        monetization_status = MonetizationStatus::ForceDemonetized;
+
+        // servers may never have a version added, if e.g. they are a vanilla server
+        // but we need at least 1 version on this project for certain features,
+        // like search indexing, to work.
+        // so we generate a synthetic initial version.
+        let version_id = models::generate_version_id(&mut txn)
+            .await
+            .wrap_internal_err("failed to generate project ID")?;
+        version_builder = Some(VersionBuilder {
+            version_id,
+            project_id: project_id.into(),
+            author_id: user.id.into(),
+            name: "__synthetic".into(),
+            version_number: String::new(),
+            changelog: String::new(),
+            files: Vec::new(),
+            dependencies: Vec::new(),
+            loaders: Vec::new(),
+            version_fields: Vec::new(),
+            version_type: VersionType::Release.to_string(),
+            featured: false,
+            status: VersionStatus::Listed,
+            requested_status: None,
+            ordering: None,
+            components: exp::VersionCreate {
+                base: None,
+                minecraft_java_server: None,
+            },
+        });
+    }
 
     let project_builder = ProjectBuilder {
         project_id: project_id.into(),
@@ -268,6 +303,14 @@ pub async fn create(
         .insert(&mut txn)
         .await
         .wrap_internal_err("failed to insert project")?;
+
+    if let Some(version_builder) = version_builder {
+        version_builder
+            .insert(&mut txn)
+            .await
+            .wrap_internal_err("failed to insert initial version")?;
+    }
+
     DBUser::clear_project_cache(&[user.id.into()], &redis)
         .await
         .wrap_internal_err("failed to clear user project cache")?;

apps/labrinth/src/routes/v3/project_creation/new.rs

@@ -15,6 +15,7 @@ use crate::database::models::{
     DBProjectId, DBVersionId, LoaderFieldEnumId, LoaderFieldEnumValueId,
     LoaderFieldId,
 };
+use crate::models::exp;
 use crate::models::projects::from_duplicate_version_fields;
 use crate::models::v2::projects::LegacyProject;
 use crate::routes::v2_reroute;
@@ -40,18 +41,20 @@ pub async fn index_local(
         slug: Option<String>,
         color: Option<i32>,
         license: String,
+        components: exp::ProjectSerial,
     }
 
     let db_projects = sqlx::query!(
-        "
+        r#"
         SELECT m.id id, m.name name, m.summary summary, m.downloads downloads, m.follows follows,
-        m.icon_url icon_url, m.updated updated, m.approved approved, m.published, m.license license, m.slug slug, m.color
+        m.icon_url icon_url, m.updated updated, m.approved approved, m.published, m.license license, m.slug slug, m.color,
+        m.components AS "components: sqlx::types::Json<exp::ProjectSerial>"
         FROM mods m
         WHERE m.status = ANY($1) AND m.id > $3
         GROUP BY m.id
         ORDER BY m.id ASC
         LIMIT $2;
-        ",
+        "#,
         &*crate::models::projects::ProjectStatus::iterator()
         .filter(|x| x.is_searchable())
         .map(|x| x.to_string())
@@ -73,6 +76,7 @@ pub async fn index_local(
                 slug: m.slug,
                 color: m.color,
                 license: m.license,
+                components: m.components.0,
             }
         })
         .try_collect::<Vec<PartialProject>>()
@@ -336,7 +340,12 @@ pub async fn index_local(
                     .collect();
                 let mut loader_fields =
                     from_duplicate_version_fields(version_fields);
-                let project_types = version.project_types;
+                let mut project_types = version.project_types;
+
+                exp::compat::correct_project_types(
+                    &project.components,
+                    &mut project_types,
+                );
 
                 let mut version_loaders = version.loaders;