add: cloudflare turnstile captcha

add: "popular communities" card in communities list

crates/app/src/routes/api/v1/auth/mod.rs

@@ -3,7 +3,7 @@ pub mod ipbans;
 pub mod profile;
 pub mod social;
 
-use super::AuthProps;
+use super::{LoginProps, RegisterProps};
 use crate::{
     State, get_user_from_token,
     model::{ApiReturn, Error, auth::User},
@@ -16,12 +16,14 @@ use axum::{
 use axum_extra::extract::CookieJar;
 use tetratto_shared::hash::hash;
 
+use cf_turnstile::{SiteVerifyRequest, TurnstileClient};
+
 /// `/api/v1/auth/register`
 pub async fn register_request(
     headers: HeaderMap,
     jar: CookieJar,
     Extension(data): Extension<State>,
-    Json(props): Json<AuthProps>,
+    Json(props): Json<RegisterProps>,
 ) -> impl IntoResponse {
     let data = &(data.read().await).0;
     let user = get_user_from_token!(jar, data);
@@ -50,8 +52,31 @@ pub async fn register_request(
         return (None, Json(Error::NotAllowed.into()));
     }
 
+    // check captcha
+    let client = TurnstileClient::new(data.0.turnstile.secret_key.clone().into());
+
+    let validated = match client
+        .siteverify(SiteVerifyRequest {
+            response: props.captcha_response,
+            ..Default::default()
+        })
+        .await
+    {
+        Ok(v) => v,
+        Err(e) => return (None, Json(Error::MiscError(e.to_string()).into())),
+    };
+
+    if !validated.success | !props.policy_consent {
+        return (
+            None,
+            Json(Error::MiscError("Captcha failed".to_string()).into()),
+        );
+    }
+
     // ...
     let mut user = User::new(props.username, props.password);
+    user.settings.policy_consent = true;
+
     let (initial_token, t) = User::create_token(&real_ip);
     user.tokens.push(t);
 
@@ -81,7 +106,7 @@ pub async fn login_request(
     headers: HeaderMap,
     jar: CookieJar,
     Extension(data): Extension<State>,
-    Json(props): Json<AuthProps>,
+    Json(props): Json<LoginProps>,
 ) -> impl IntoResponse {
     let data = &(data.read().await).0;
     let user = get_user_from_token!(jar, data);

crates/app/src/routes/api/v1/mod.rs

@@ -188,11 +188,19 @@ pub fn routes() -> Router {
 }
 
 #[derive(Deserialize)]
-pub struct AuthProps {
+pub struct LoginProps {
     pub username: String,
     pub password: String,
 }
 
+#[derive(Deserialize)]
+pub struct RegisterProps {
+    pub username: String,
+    pub password: String,
+    pub policy_consent: bool,
+    pub captcha_response: String,
+}
+
 #[derive(Deserialize)]
 pub struct CreateCommunity {
     pub title: String,

crates/app/src/routes/pages/communities.rs

@@ -108,6 +108,11 @@ pub async fn list_request(jar: CookieJar, Extension(data): Extension<State>) ->
         Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
     };
 
+    let popular_list = match data.0.get_popular_communities().await {
+        Ok(p) => p,
+        Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
+    };
+
     let mut communities: Vec<Community> = Vec::new();
     for membership in &list {
         match data.0.get_community_by_id(membership.community).await {
@@ -118,7 +123,9 @@ pub async fn list_request(jar: CookieJar, Extension(data): Extension<State>) ->
 
     let lang = get_lang!(jar, data.0);
     let mut context = initial_context(&data.0.0, lang, &Some(user)).await;
+
     context.insert("list", &communities);
+    context.insert("popular_list", &popular_list);
 
     // return
     Ok(Html(