feat(bot): use avater service for image verify

crates/avatars/src/main.rs

@@ -16,6 +16,7 @@ use axum::{
 use libpk::_config::AvatarsConfig;
 use libpk::db::repository::avatars as db;
 use libpk::db::types::avatars::*;
+use pull::ParsedUrl;
 use reqwest::{Client, ClientBuilder};
 use serde::{Deserialize, Serialize};
 use sqlx::PgPool;
@@ -35,9 +36,15 @@ pub enum PKAvatarError {
     #[error("discord cdn responded with status code: {0}")]
     BadCdnResponse(reqwest::StatusCode),
 
+    #[error("server responded with status code: {0}")]
+    BadServerResponse(reqwest::StatusCode),
+
     #[error("network error: {0}")]
     NetworkError(reqwest::Error),
 
+    #[error("network error: {0}")]
+    NetworkErrorString(String),
+
     #[error("response is missing header: {0}")]
     MissingHeader(&'static str),
 
@@ -86,7 +93,6 @@ async fn pull(
 ) -> Result<Json<PullResponse>, PKAvatarError> {
     let parsed = pull::parse_url(&req.url) // parsing beforehand to "normalize"
         .map_err(|_| PKAvatarError::InvalidCdnUrl)?;
-
     if !req.force {
         if let Some(existing) = db::get_by_attachment_id(&state.pool, parsed.attachment_id).await? {
             // remove any pending image cleanup
@@ -132,6 +138,26 @@ async fn pull(
     }))
 }
 
+async fn verify(
+    State(state): State<AppState>,
+    Json(req): Json<PullRequest>,
+) -> Result<(), PKAvatarError> {
+    let result = crate::pull::pull(
+        state.pull_client,
+        &ParsedUrl {
+            full_url: req.url.clone(),
+            channel_id: 0,
+            attachment_id: 0,
+            filename: "".to_string(),
+        },
+    )
+    .await?;
+
+    let encoded = process::process_async(result.data, req.kind).await?;
+
+    Ok(())
+}
+
 pub async fn stats(State(state): State<AppState>) -> Result<Json<Stats>, PKAvatarError> {
     Ok(Json(db::get_stats(&state.pool).await?))
 }
@@ -193,6 +219,7 @@ async fn real_main() -> anyhow::Result<()> {
     // migrate::spawn_migrate_workers(Arc::new(state.clone()), state.config.migrate_worker_count);
 
     let app = Router::new()
+        .route("/verify", post(verify))
         .route("/pull", post(pull))
         .route("/stats", get(stats))
         .with_state(state);

crates/avatars/src/pull.rs

@@ -3,6 +3,8 @@ use std::{str::FromStr, sync::Arc};
 use crate::PKAvatarError;
 use anyhow::Context;
 use reqwest::{Client, StatusCode, Url};
+use std::error::Error;
+use std::fmt::Write;
 use std::time::Instant;
 use tracing::{error, instrument};
 
@@ -28,14 +30,29 @@ pub async fn pull(
             .expect("set_host should not fail");
     }
     let response = client.get(trimmed_url.clone()).send().await.map_err(|e| {
-        error!("network error for {}: {}", parsed_url.full_url, e);
-        PKAvatarError::NetworkError(e)
+        // terrible
+        let mut s = format!("{}", e);
+        if let Some(src) = e.source() {
+            let _ = write!(s, "\n\nCaused by: {}", src);
+            let mut err = src;
+            while let Some(src) = err.source() {
+                let _ = write!(s, "\n\nCaused by: {}", src);
+                err = src;
+            }
+        }
+
+        error!("network error for {}: {}", parsed_url.full_url, s);
+        PKAvatarError::NetworkErrorString(s)
     })?;
     let time_after_headers = Instant::now();
     let status = response.status();
 
     if status != StatusCode::OK {
-        return Err(PKAvatarError::BadCdnResponse(status));
+        if trimmed_url.host_str() == Some("cdn.discordapp.com") {
+            return Err(PKAvatarError::BadCdnResponse(status));
+        } else {
+            return Err(PKAvatarError::BadServerResponse(status));
+        }
     }
 
     let size = match response.content_length() {