Merge remote-tracking branch 'refs/remotes/upstream/main' into dependents-search

Author: IThundxr

apps/frontend/wrangler.jsonc

@@ -55,8 +55,8 @@
 			"vars": {
 				"ENVIRONMENT": "staging",
 				"SENTRY_ENVIRONMENT": "staging",
-				"BASE_URL": "https://api.modrinth.com/v2/",
-				"BROWSER_BASE_URL": "https://api.modrinth.com/v2/",
+				"BASE_URL": "https://staging-api.modrinth.com/v2/",
+				"BROWSER_BASE_URL": "https://staging-api.modrinth.com/v2/",
 				"PYRO_BASE_URL": "https://staging-archon.modrinth.com/",
 				"STRIPE_PUBLISHABLE_KEY": "pk_test_51JbFxJJygY5LJFfKV50mnXzz3YLvBVe2Gd1jn7ljWAkaBlRz3VQdxN9mXcPSrFbSqxwAb0svte9yhnsmm7qHfcWn00R611Ce7b"
 			},

apps/labrinth/.sqlx/query-654ca85d28573de9b532d0768e5250baa3a5f200fcf9ae990575073d0a1043e0.json

@@ -9,6 +9,9 @@ use crate::env::ENV;
 use crate::queue::server_ping;
 use crate::routes::analytics::MINECRAFT_SERVER_PLAYS;
 
+pub const DOWNLOADS: &str = "downloads";
+pub const PLAYTIME: &str = "playtime";
+
 pub async fn init_client() -> clickhouse::error::Result<clickhouse::Client> {
     init_client_with_database(&ENV.CLICKHOUSE_DATABASE).await
 }
@@ -90,7 +93,7 @@ pub async fn init_client_with_database(
     client
         .query(&format!(
             "
-            CREATE TABLE IF NOT EXISTS {database}.downloads {cluster_line}
+            CREATE TABLE IF NOT EXISTS {database}.{DOWNLOADS} {cluster_line}
             (
                 recorded DateTime64(4),
                 domain String,
@@ -117,7 +120,7 @@ pub async fn init_client_with_database(
     client
         .query(&format!(
             "
-            CREATE TABLE IF NOT EXISTS {database}.playtime {cluster_line}
+            CREATE TABLE IF NOT EXISTS {database}.{PLAYTIME} {cluster_line}
             (
                 recorded DateTime64(4),
                 seconds UInt64,
@@ -238,5 +241,27 @@ pub async fn init_client_with_database(
         .execute()
         .await?;
 
+    client
+        .query(&format!(
+            "
+            ALTER TABLE {database}.{DOWNLOADS} {cluster_line}
+            ADD COLUMN IF NOT EXISTS reason String,
+            ADD COLUMN IF NOT EXISTS game_version String,
+            ADD COLUMN IF NOT EXISTS loader String
+            "
+        ))
+        .execute()
+        .await?;
+
+    client
+        .query(&format!(
+            "
+            ALTER TABLE {database}.{PLAYTIME} {cluster_line}
+            ADD COLUMN IF NOT EXISTS country String
+            "
+        ))
+        .execute()
+        .await?;
+
     Ok(client.with_database(database))
 }

apps/labrinth/.sqlx/query-80734c33c16aeacca980cf40070bac035931a0bab8c0d0cf63888c8e5616f847.json

@@ -1,3 +1,5 @@
+#![recursion_limit = "256"]
+
 use std::sync::Arc;
 use std::time::Duration;
 

apps/labrinth/.sqlx/query-81b65298ddf4c58b884b15e64f1f4f5aa006944c05980a5b5da366135d17c912.json

@@ -17,6 +17,12 @@ pub struct LegacyResultSearchProject {
     pub project_type: String,
     pub slug: Option<String>,
     pub author: String,
+    #[serde(default)]
+    pub author_id: Option<String>,
+    #[serde(default)]
+    pub organization: Option<String>,
+    #[serde(default)]
+    pub organization_id: Option<String>,
     pub title: String,
     pub description: String,
     pub categories: Vec<String>,
@@ -139,6 +145,9 @@ impl LegacyResultSearchProject {
             project_id: result_search_project.project_id,
             slug: result_search_project.slug,
             author: result_search_project.author,
+            author_id: result_search_project.author_id,
+            organization: result_search_project.organization,
+            organization_id: result_search_project.organization_id,
             title: result_search_project.name,
             description: result_search_project.summary,
             display_categories,

apps/labrinth/.sqlx/query-e50e308826d1e7fa54cade7daf8120b4ae4068bd086dc08f572b33cfc2476354.json

@@ -23,6 +23,23 @@ pub struct Download {
     pub country: String,
     pub user_agent: String,
     pub headers: Vec<(String, String)>,
+
+    // added retroactively - may be missing
+    pub reason: Option<DownloadReason>,
+    pub game_version: Option<String>,
+    pub loader: Option<String>,
+}
+
+/// Why a project was downloaded.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+pub enum DownloadReason {
+    /// Project was downloaded directly by the user.
+    Standalone,
+    /// Project was downloaded as a dependency, possibly transitive, of another
+    /// project.
+    Dependency,
+    /// Project was downloaded as part of a modpack.
+    Modpack,
 }
 
 #[derive(Debug, Row, Serialize, Deserialize, Clone, Eq, PartialEq, Hash)]
@@ -77,6 +94,9 @@ pub struct Playtime {
     pub game_version: String,
     /// Parent modpack this playtime was recorded in
     pub parent: u64,
+
+    // added retroactively - may be missing
+    pub country: Option<String>,
 }
 
 #[derive(Row, Serialize, Deserialize, Clone, Debug, Eq, PartialEq, Hash)]

apps/labrinth/src/clickhouse/mod.rs

@@ -214,6 +214,8 @@ async fn playtime_ingest(
     )
     .await?;
 
+    let headers = req.headers();
+
     for (id, playtime) in playtimes {
         if playtime.seconds > 300 {
             continue;
@@ -230,6 +232,9 @@ async fn playtime_ingest(
                 loader: playtime.loader,
                 game_version: playtime.game_version,
                 parent: playtime.parent.map_or(0, |x| x.0),
+                country: headers
+                    .get("cf-ipcountry")
+                    .and_then(|c| c.to_str().map(|s| s.to_string()).ok()),
             });
         }
     }