use crate::{captcha_as_wav_base64, Perform};
use actix_web::web::Data;
use captcha::{gen, Difficulty};
-use chrono::Duration;
use lemmy_api_common::{
context::LemmyContext,
person::{CaptchaResponse, GetCaptcha, GetCaptchaResponse},
};
-use lemmy_db_schema::{
- source::{captcha_answer::CaptchaAnswer, local_site::LocalSite},
- utils::naive_now,
+use lemmy_db_schema::source::{
+ captcha_answer::{CaptchaAnswer, CaptchaAnswerForm},
+ local_site::LocalSite,
};
use lemmy_utils::error::LemmyError;
#[tracing::instrument(skip(context))]
async fn perform(&self, context: &Data<LemmyContext>) -> Result<Self::Response, LemmyError> {
- let local_site = LocalSite::read(context.pool()).await?;
+ let local_site = LocalSite::read(&mut context.pool()).await?;
if !local_site.captcha_enabled {
return Ok(GetCaptchaResponse { ok: None });
let png = captcha.as_base64().expect("failed to generate captcha");
- let uuid = uuid::Uuid::new_v4().to_string();
+ let wav = captcha_as_wav_base64(&captcha)?;
- let wav = captcha_as_wav_base64(&captcha);
-
- let captcha: CaptchaAnswer = CaptchaAnswer {
- answer,
- uuid: uuid.clone(),
- expires: naive_now() + Duration::minutes(10), // expires in 10 minutes
- };
+ let captcha_form: CaptchaAnswerForm = CaptchaAnswerForm { answer };
// Stores the captcha item in the db
- CaptchaAnswer::insert(context.pool(), &captcha).await?;
+ let captcha = CaptchaAnswer::insert(&mut context.pool(), &captcha_form).await?;
Ok(GetCaptchaResponse {
- ok: Some(CaptchaResponse { png, wav, uuid }),
+ ok: Some(CaptchaResponse {
+ png,
+ wav,
+ uuid: captcha.uuid.to_string(),
+ }),
})
}
}