add: profile is_verified

add: better profile not found page
TODO: use error page for fallback service

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

@@ -1,10 +1,14 @@
 use crate::{
     State, get_user_from_token,
     model::{ApiReturn, Error},
+    routes::api::v1::UpdateUserIsVerified,
 };
 use axum::{Extension, Json, extract::Path, response::IntoResponse};
 use axum_extra::extract::CookieJar;
-use tetratto_core::model::{auth::UserSettings, permissions::FinePermission};
+use tetratto_core::model::{
+    auth::{Token, UserSettings},
+    permissions::FinePermission,
+};
 
 /// Update the settings of the given user.
 pub async fn update_profile_settings_request(
@@ -28,7 +32,62 @@ pub async fn update_profile_settings_request(
     match data.update_user_settings(id, req).await {
         Ok(_) => Json(ApiReturn {
             ok: true,
-            message: "User unfollowed".to_string(),
+            message: "Settings updated".to_string(),
+            payload: (),
+        }),
+        Err(e) => Json(e.into()),
+    }
+}
+
+/// Update the tokens of the given user.
+pub async fn update_profile_tokens_request(
+    jar: CookieJar,
+    Path(id): Path<usize>,
+    Extension(data): Extension<State>,
+    Json(req): Json<Vec<Token>>,
+) -> impl IntoResponse {
+    let data = &(data.read().await).0;
+    let user = match get_user_from_token!(jar, data) {
+        Some(ua) => ua,
+        None => return Json(Error::NotAllowed.into()),
+    };
+
+    if user.id != id {
+        if !user.permissions.check(FinePermission::MANAGE_USERS) {
+            return Json(Error::NotAllowed.into());
+        }
+    }
+
+    match data.update_user_tokens(id, req).await {
+        Ok(_) => Json(ApiReturn {
+            ok: true,
+            message: "Tokens updated".to_string(),
+            payload: (),
+        }),
+        Err(e) => Json(e.into()),
+    }
+}
+
+/// Update the verification status of the given user.
+pub async fn update_profile_is_verified_request(
+    jar: CookieJar,
+    Path(id): Path<usize>,
+    Extension(data): Extension<State>,
+    Json(req): Json<UpdateUserIsVerified>,
+) -> impl IntoResponse {
+    let data = &(data.read().await).0;
+    let user = match get_user_from_token!(jar, data) {
+        Some(ua) => ua,
+        None => return Json(Error::NotAllowed.into()),
+    };
+
+    match data
+        .update_user_verified_status(id, req.is_verified, user)
+        .await
+    {
+        Ok(_) => Json(ApiReturn {
+            ok: true,
+            message: "Verified status updated".to_string(),
             payload: (),
         }),
         Err(e) => Json(e.into()),

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

@@ -82,6 +82,14 @@ pub fn routes() -> Router {
             "/auth/profile/{id}/settings",
             post(auth::profile::update_profile_settings_request),
         )
+        .route(
+            "/auth/profile/{id}/tokens",
+            post(auth::profile::update_profile_tokens_request),
+        )
+        .route(
+            "/auth/profile/{id}/verified",
+            post(auth::profile::update_profile_is_verified_request),
+        )
 }
 
 #[derive(Deserialize)]
@@ -140,3 +148,8 @@ pub struct CreateReaction {
     pub asset_type: AssetType,
     pub is_like: bool,
 }
+
+#[derive(Deserialize)]
+pub struct UpdateUserIsVerified {
+    pub is_verified: bool,
+}

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

@@ -3,6 +3,14 @@ pub mod misc;
 pub mod profile;
 
 use axum::{Router, routing::get};
+use axum_extra::extract::CookieJar;
+use serde::Deserialize;
+use tetratto_core::{
+    DataManager,
+    model::{Error, auth::User},
+};
+
+use crate::{assets::initial_context, get_lang};
 
 pub fn routes() -> Router {
     Router::new()
@@ -14,3 +22,21 @@ pub fn routes() -> Router {
         // profile
         .route("/user/{username}", get(profile::posts_request))
 }
+
+pub fn render_error(
+    e: Error,
+    jar: &CookieJar,
+    data: &(DataManager, tera::Tera),
+    user: &Option<User>,
+) -> String {
+    let lang = get_lang!(jar, data.0);
+    let mut context = initial_context(&data.0.0, lang, &user);
+    context.insert("error_text", &e.to_string());
+    data.1.render("misc/error.html", &mut context).unwrap()
+}
+
+#[derive(Deserialize)]
+pub struct PaginatedQuery {
+    #[serde(default)]
+    pub page: usize,
+}

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

@@ -1,7 +1,8 @@
+use super::{PaginatedQuery, render_error};
 use crate::{State, assets::initial_context, get_lang, get_user_from_token};
 use axum::{
     Extension,
-    extract::Path,
+    extract::{Path, Query},
     response::{Html, IntoResponse},
 };
 use axum_extra::extract::CookieJar;
@@ -10,6 +11,7 @@ use axum_extra::extract::CookieJar;
 pub async fn posts_request(
     jar: CookieJar,
     Path(username): Path<String>,
+    Query(props): Query<PaginatedQuery>,
     Extension(data): Extension<State>,
 ) -> impl IntoResponse {
     let data = data.read().await;
@@ -17,12 +19,23 @@ pub async fn posts_request(
 
     let other_user = match data.0.get_user_by_username(&username).await {
         Ok(ua) => ua,
-        Err(e) => return Err(Html(e.to_string())),
+        Err(e) => return Err(Html(render_error(e, &jar, &data, &user))),
+    };
+
+    let posts = match data
+        .0
+        .get_posts_by_user(other_user.id, 12, props.page)
+        .await
+    {
+        Ok(p) => p,
+        Err(e) => return Err(Html(render_error(e, &jar, &data, &user))),
     };
 
     let lang = get_lang!(jar, data.0);
     let mut context = initial_context(&data.0.0, lang, &user);
+
     context.insert("profile", &other_user);
+    context.insert("posts", &posts);
 
     Ok(Html(
         data.1.render("profile/posts.html", &mut context).unwrap(),