Clean diff

Author: TreehouseFalcon

src/abbreviate.rs

@@ -1,11 +1,11 @@
 const ONE_THOUSAND: f64 = 1_000.0;
 const ONE_MILLION: f64 = 1_000_000.0;
-const ONE_MORBILLION: f64 = 1_000_000_000.0;
+const ONE_BILLION: f64 = 1_000_000_000.0;
 
 pub fn abbreviate_number(n: i32) -> String {
     let n = n as f64;
-    if n.abs() >= ONE_MORBILLION {
-        format!("{:.1}B", n / ONE_MORBILLION)
+    if n.abs() >= ONE_BILLION {
+        format!("{:.1}B", n / ONE_BILLION)
     } else if n.abs() >= ONE_MILLION {
         format!("{:.1}M", n / ONE_MILLION)
     } else if n.abs() >= ONE_THOUSAND {

src/endpoints/mods.rs

@@ -26,9 +26,9 @@ use crate::types::models::mod_version_status::ModVersionStatusEnum;
 use crate::webhook::discord::DiscordWebhook;
 use actix_web::{HttpResponse, Responder, get, post, put, web};
 use serde::Deserialize;
-use sqlx::Acquire;
-use utoipa::{IntoParams, ToSchema};
 use serde::Serialize;
+use sqlx::Acquire;
+use utoipa::{ToSchema, IntoParams};
 
 #[derive(Deserialize, Default, Hash, Eq, PartialEq, ToSchema)]
 #[serde(rename_all = "snake_case")]
@@ -78,6 +78,7 @@ pub struct CreateQueryParams {
         (status = 403, description = "Forbidden")
     )
 )]
+
 #[get("/v1/mods")]
 pub async fn index(
     data: web::Data<AppData>,
@@ -214,9 +215,7 @@ pub async fn create(
     let existing: Option<Mod> = mods::get_one(&json.id, false, &mut pool).await?;
 
     if json.id.starts_with("geode.") && !dev.admin {
-        return Err(ApiError::BadRequest(
-            "Only index admins may use mod ids that start with 'geode.'".into(),
-        ));
+        return Err(ApiError::BadRequest("Only index admins may use mod ids that start with 'geode.'".into()));
     }
 
     if let Some(m) = &existing {

src/types/models/download_count.rs

@@ -38,24 +38,3 @@ impl Serialize for DownloadCount {
         }
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::DownloadCount;
-
-    #[test]
-    fn serializes_as_number_by_default() {
-        let serialized = serde_json::to_string(&DownloadCount::new(1234)).unwrap();
-
-        assert_eq!(serialized, "1234");
-    }
-
-    #[test]
-    fn serializes_as_abbreviated_string_when_enabled() {
-        let mut count = DownloadCount::new(1234);
-        count.set_abbreviated(true);
-        let serialized = serde_json::to_string(&count).unwrap();
-
-        assert_eq!(serialized, "\"1.2K\"");
-    }
-}

src/types/models/mod_entity.rs

@@ -23,15 +23,15 @@ use crate::{
     },
 };
 use semver::Version;
+use serde::Serialize;
+use utoipa::ToSchema;
 use sqlx::{
     PgConnection,
     types::chrono::{DateTime, Utc},
 };
 use std::collections::HashMap;
-use serde::Serialize;
-use utoipa::ToSchema;
 
-#[derive(Serialize, Debug, Clone, ToSchema)]
+#[derive(Serialize, Debug, Clone, sqlx::FromRow, ToSchema)]
 pub struct Mod {
     pub id: String,
     pub repository: Option<String>,

src/types/models/mod_version.rs

@@ -14,15 +14,15 @@ use crate::types::{
     serde::chrono_dt_secs,
 };
 use semver::Version;
+use serde::Serialize;
+use utoipa::ToSchema;
 use sqlx::{
     PgConnection, Postgres, QueryBuilder,
     types::chrono::{DateTime, Utc},
 };
 use std::collections::HashMap;
-use serde::Serialize;
-use utoipa::ToSchema;
 
-#[derive(Serialize, Debug, Clone, ToSchema)]
+#[derive(Serialize, Debug, sqlx::FromRow, Clone, ToSchema)]
 pub struct ModVersion {
     #[serde(skip_serializing)]
     pub id: i32,