merge queue: checking main (cc53d9a) and #6956 together

Cargo.toml

@@ -15,6 +15,7 @@ members = [
   "packages/modrinth-util",
   "packages/neverbounce",
   "packages/path-util",
+  "packages/serde-binhum",
   "packages/xredis",
 ]
 
@@ -183,6 +184,7 @@ sentry = { version = "0.45.0", default-features = false, features = [
   "rustls",
 ] }
 serde = "1.0.228"
+serde-binhum = { path = "packages/serde-binhum" }
 serde_bytes = "0.11.19"
 serde_cbor = "0.11.2"
 serde_ini = "0.2.0"

apps/frontend/src/pages/[type]/[project].vue

@@ -2014,9 +2014,7 @@ const navLinks = computed(() => {
 			label: formatMessage(messages.changelogTab),
 			href: withInstallContextQuery(`${projectUrl}/changelog`),
 			shown:
-				hasVersions.value &&
-				projectV3Loaded.value &&
-				projectV3.value?.minecraft_server === undefined,
+				hasVersions.value && projectV3Loaded.value && projectV3.value?.minecraft_server == null,
 			onHover: loadVersions,
 		},
 		{
@@ -2025,7 +2023,7 @@ const navLinks = computed(() => {
 			shown:
 				(hasVersions.value || !!currentMember.value) &&
 				projectV3Loaded.value &&
-				projectV3.value?.minecraft_server === undefined,
+				projectV3.value?.minecraft_server == null,
 			subpages: [`${projectUrl}/version/`],
 			onHover: loadVersions,
 		},

apps/labrinth/AGENTS.md

@@ -12,8 +12,10 @@
   - no trailing punctuation
   - wrap code items e.g. type names in backticks
 - Prefer `wrap_internal_err`, `wrap_request_err` when attaching context to an existing error (like Anyhow `context` or Eyre `wrap_err`)
+- Prefer importing `eyre::Result` and using `Result<T>` instead of `eyre::Result<T>`
+- Prefer `eyre::Ok(value)` instead of `Ok::<_, eyre::Report>(value)` when an explicit Eyre result type is needed
 - All operations should ideally have some context attached
-  - Database operations can have a message like `.wrap_internal_err("failed to fetch XYZ")`
+  - Database operations can have a message like `.wrap_internal_err("fetching XYZ")`
 - You can perform real-time queries against the databases in the Docker Compose
   - `docker exec labrinth-postgres psql -c "select 1"`
   - `docker exec labrinth-redis redis-cli flushall`

apps/labrinth/Cargo.toml

@@ -111,6 +111,7 @@ rusty-money = { workspace = true }
 scalar_api_reference = { workspace = true, features = ["actix-web"] }
 sentry = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
+serde-binhum = { workspace = true }
 serde_json = { workspace = true }
 serde_with = { workspace = true }
 sha1 = { workspace = true }

apps/labrinth/src/auth/mod.rs

@@ -59,12 +59,6 @@ pub enum AuthenticationError {
     Url,
 }
 
-impl From<xredis::Error> for AuthenticationError {
-    fn from(error: xredis::Error) -> Self {
-        Self::Database(error.into())
-    }
-}
-
 impl actix_web::ResponseError for AuthenticationError {
     fn status_code(&self) -> StatusCode {
         match self {

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

@@ -9,7 +9,7 @@ use crate::{
 };
 use serde::{Deserialize, Serialize};
 
-const ANALYTICS_EVENTS_NAMESPACE: &str = "analytics_events:v3";
+const ANALYTICS_EVENTS_NAMESPACE: &str = "analytics_events:v4";
 const ANALYTICS_EVENTS_ALL_KEY: &str = "all";
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

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

@@ -7,7 +7,7 @@ use super::ids::*;
 use futures::TryStreamExt;
 use serde::{Deserialize, Serialize};
 
-const TAGS_NAMESPACE: &str = "tags:v3";
+const TAGS_NAMESPACE: &str = "tags:v4";
 
 pub struct ProjectType {
     pub id: ProjectTypeId,

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

@@ -8,7 +8,7 @@ use futures::TryStreamExt;
 use serde::{Deserialize, Serialize};
 use xredis::RedisPool;
 
-const COLLECTIONS_NAMESPACE: &str = "collections:v3";
+const COLLECTIONS_NAMESPACE: &str = "collections:v4";
 
 #[derive(Clone)]
 pub struct CollectionBuilder {