refactor(schema): simplify validation and OpenAPI generation (#2709)

fluxer_admin/src/api/bans.rs

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-use crate::api::generated::types as generated_types;
+use crate::api::generated::{snowflake, types as generated_types};
 
 use super::client::{AdminApiClient, ApiError, ApiResult};
 use super::types::{BanAvatarResult, BanCheckResult, BulkBanResult};
@@ -9,10 +9,12 @@ impl AdminApiClient {
     pub async fn ban_email(&self, email: &str) -> ApiResult<()> {
         self.create_blocklist_entry(
             "email",
-            generated_types::BanEmailRequest {
-                email: generated_types::EmailType::from(email.to_owned()),
-            }
-            .into(),
+            generated_types::AdminBlocklistEntryCreateRequest {
+                subtype_1: Some(generated_types::BanEmailRequest {
+                    email: generated_types::EmailType::from(email.to_owned()),
+                }),
+                ..Default::default()
+            },
         )
         .await
     }
@@ -28,7 +30,10 @@ impl AdminApiClient {
     pub async fn ban_ip(&self, ip: &str) -> ApiResult<()> {
         self.create_blocklist_entry(
             "ip",
-            generated_types::BanIpRequest { ip: ip.to_owned() }.into(),
+            generated_types::AdminBlocklistEntryCreateRequest {
+                subtype_0: Some(generated_types::BanIpRequest { ip: ip.to_owned() }),
+                ..Default::default()
+            },
         )
         .await
     }
@@ -44,7 +49,10 @@ impl AdminApiClient {
     pub async fn add_suspicious_email_domain(&self, domain: &str) -> ApiResult<()> {
         self.create_blocklist_entry(
             SUSPICIOUS_EMAIL_DOMAIN_LIST,
-            suspicious_email_domain_request(domain)?.into(),
+            generated_types::AdminBlocklistEntryCreateRequest {
+                subtype_2: Some(suspicious_email_domain_request(domain)?),
+                ..Default::default()
+            },
         )
         .await
     }
@@ -62,10 +70,12 @@ impl AdminApiClient {
     pub async fn ban_phrase(&self, phrase: &str) -> ApiResult<()> {
         self.create_blocklist_entry(
             "phrase",
-            generated_types::BanPhraseRequest {
-                phrase: phrase.to_owned(),
-            }
-            .into(),
+            generated_types::AdminBlocklistEntryCreateRequest {
+                subtype_3: Some(generated_types::BanPhraseRequest {
+                    phrase: phrase.to_owned(),
+                }),
+                ..Default::default()
+            },
         )
         .await
     }
@@ -81,14 +91,16 @@ impl AdminApiClient {
     pub async fn ban_url(&self, url: &str) -> ApiResult<()> {
         self.create_blocklist_entry(
             "url",
-            generated_types::BanUrlRequest {
-                category: None,
-                notes: None,
-                severity: None,
-                source_url: None,
-                url: url.to_owned(),
-            }
-            .into(),
+            generated_types::AdminBlocklistEntryCreateRequest {
+                subtype_4: Some(generated_types::BanUrlRequest {
+                    category: None,
+                    notes: None,
+                    severity: None,
+                    source_url: None,
+                    url: url.to_owned(),
+                }),
+                ..Default::default()
+            },
         )
         .await
     }
@@ -104,15 +116,17 @@ impl AdminApiClient {
     pub async fn ban_url_domain(&self, domain: &str, match_subdomains: bool) -> ApiResult<()> {
         self.create_blocklist_entry(
             "url-domain",
-            generated_types::BanUrlDomainRequest {
-                category: None,
-                domain: domain.to_owned(),
-                match_subdomains: Some(match_subdomains),
-                notes: None,
-                severity: None,
-                source_url: None,
-            }
-            .into(),
+            generated_types::AdminBlocklistEntryCreateRequest {
+                subtype_5: Some(generated_types::BanUrlDomainRequest {
+                    category: None,
+                    domain: domain.to_owned(),
+                    match_subdomains,
+                    notes: None,
+                    severity: None,
+                    source_url: None,
+                }),
+                ..Default::default()
+            },
         )
         .await
     }
@@ -131,16 +145,17 @@ impl AdminApiClient {
         sha256_hex: &str,
         audit_log_reason: Option<&str>,
     ) -> ApiResult<()> {
-        let body = generated_types::AdminBlocklistEntryCreateRequest::from(
-            generated_types::BanFileShaRequest {
+        let body = generated_types::AdminBlocklistEntryCreateRequest {
+            subtype_6: Some(generated_types::BanFileShaRequest {
                 category: None,
                 content_type: None,
                 notes: None,
                 severity: None,
                 sha256_hex: sha256_hex.to_owned(),
                 source_url: None,
-            },
-        );
+            }),
+            ..Default::default()
+        };
         self.post_void_with_reason(
             "/admin/blocklists/file-sha/entries",
             Some(&serde_json::to_value(&body).map_err(|e| ApiError::Parse(e.to_string()))?),
@@ -186,15 +201,17 @@ impl AdminApiClient {
     pub async fn ban_avatar_hash(&self, hash_short: &str) -> ApiResult<()> {
         self.create_blocklist_entry(
             "avatar-hash",
-            generated_types::BanAvatarHashRequest {
-                category: None,
-                hashes: vec![hash_short.to_owned()],
-                notes: None,
-                reason: None,
-                severity: None,
-                source_url: None,
-            }
-            .into(),
+            generated_types::AdminBlocklistEntryCreateRequest {
+                subtype_7: Some(generated_types::BanAvatarHashRequest {
+                    category: None,
+                    hashes: vec![hash_short.to_owned()],
+                    notes: None,
+                    reason: None,
+                    severity: None,
+                    source_url: None,
+                }),
+                ..Default::default()
+            },
         )
         .await
     }
@@ -213,10 +230,7 @@ impl AdminApiClient {
         let body = generated_types::BanUserAvatarRequest::default();
         let response = self
             .generated()
-            .ban_admin_user_avatar(
-                &generated_types::SnowflakeType::from(user_id.to_owned()),
-                &body,
-            )
+            .ban_admin_user_avatar(&snowflake(user_id), &body)
             .await
             .map_err(|e| self.generated_error(e))?;
         self.generated_value(response.into_inner())
@@ -225,7 +239,10 @@ impl AdminApiClient {
     pub async fn ban_profile_substring(&self, scope: &str, substring: &str) -> ApiResult<()> {
         self.create_blocklist_entry(
             PROFILE_SUBSTRING_LIST,
-            profile_substring_request(scope, substring)?.into(),
+            generated_types::AdminBlocklistEntryCreateRequest {
+                subtype_8: Some(profile_substring_request(scope, substring)?),
+                ..Default::default()
+            },
         )
         .await
     }
@@ -249,6 +266,7 @@ impl AdminApiClient {
         list_type: &str,
         body: generated_types::AdminBlocklistEntryCreateRequest,
     ) -> ApiResult<()> {
+        let list_type = blocklist_list_type(list_type)?;
         self.generated()
             .create_admin_blocklist_entry(list_type, &body)
             .await
@@ -262,6 +280,7 @@ impl AdminApiClient {
         entry_value: &str,
         scope: Option<&str>,
     ) -> ApiResult<()> {
+        let list_type = blocklist_list_type(list_type)?;
         let scope = scope.map(blocklist_delete_scope).transpose()?;
         self.generated()
             .delete_admin_blocklist_entry(list_type, entry_value, scope)
@@ -276,6 +295,7 @@ impl AdminApiClient {
         entry_value: &str,
         scope: Option<&str>,
     ) -> ApiResult<BanCheckResult> {
+        let list_type = blocklist_list_type(list_type)?;
         let scope = scope.map(blocklist_get_scope).transpose()?;
         let response = self
             .generated()
@@ -290,6 +310,11 @@ const SUSPICIOUS_EMAIL_DOMAIN_LIST: &str = "email-domain-suspicious";
 
 const PROFILE_SUBSTRING_LIST: &str = "profile-substring";
 
+fn blocklist_list_type(list_type: &str) -> ApiResult<generated_types::AdminBlocklistListType> {
+    generated_types::AdminBlocklistListType::try_from(list_type)
+        .map_err(|e| ApiError::Parse(e.to_string()))
+}
+
 fn blocklist_entry_path(list_type: &str, entry_value: &str) -> String {
     format!(
         "/admin/blocklists/{}/entries/{}",