t/tetratto
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add: questions, requests

Browse source
This commit is contained in:
trisua 2025-04-12 22:25:54 -04:00
parent 24f67221ca
commit 7960484bf9
52 changed files with 1698 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/app/src/routes/api/v1/communities/mod.rs
View file

@ -1,3 +1,4 @@
pub mod communities;
pub mod images;
pub mod posts;
pub mod questions;

43
crates/app/src/routes/api/v1/communities/posts.rs
View file

@ -19,25 +19,32 @@ pub async fn create_request(
None => return Json(Error::NotAllowed.into()),
};
match data
.create_post(Post::new(
req.content,
match req.community.parse::<usize>() {
Ok(x) => x,
let mut props = Post::new(
req.content,
match req.community.parse::<usize>() {
Ok(x) => x,
Err(e) => return Json(Error::MiscError(e.to_string()).into()),
},
if let Some(rt) = req.replying_to {
match rt.parse::<usize>() {
Ok(x) => Some(x),
Err(e) => return Json(Error::MiscError(e.to_string()).into()),
},
if let Some(rt) = req.replying_to {
match rt.parse::<usize>() {
Ok(x) => Some(x),
Err(e) => return Json(Error::MiscError(e.to_string()).into()),
}
} else {
None
},
user.id,
))
.await
{
}
} else {
None
},
user.id,
);
if !req.answering.is_empty() {
// we're answering a question!
props.context.answering = match req.answering.parse::<usize>() {
Ok(x) => x,
Err(e) => return Json(Error::MiscError(e.to_string()).into()),
};
}
match data.create_post(props).await {
Ok(id) => Json(ApiReturn {
ok: true,
message: "Post created".to_string(),

65
crates/app/src/routes/api/v1/communities/questions.rs Normal file
View file

@ -0,0 +1,65 @@
use axum::{Extension, Json, extract::Path, response::IntoResponse};
use axum_extra::extract::CookieJar;
use tetratto_core::model::{communities::Question, ApiReturn, Error};
use crate::{get_user_from_token, routes::api::v1::CreateQuestion, State};
pub async fn create_request(
jar: CookieJar,
Extension(data): Extension<State>,
Json(req): Json<CreateQuestion>,
) -> 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()),
};
let mut props = Question::new(
user.id,
match req.receiver.parse::<usize>() {
Ok(x) => x,
Err(e) => return Json(Error::MiscError(e.to_string()).into()),
},
req.content,
req.is_global,
);
if !req.community.is_empty() {
props.is_global = true;
props.receiver = 0;
props.community = match req.community.parse::<usize>() {
Ok(x) => x,
Err(e) => return Json(Error::MiscError(e.to_string()).into()),
}
}
match data.create_question(props).await {
Ok(id) => Json(ApiReturn {
ok: true,
message: "Question created".to_string(),
payload: Some(id.to_string()),
}),
Err(e) => Json(e.into()),
}
}
pub async fn delete_request(
jar: CookieJar,
Extension(data): Extension<State>,
Path(id): Path<usize>,
) -> 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.delete_question(id, &user).await {
Ok(_) => Json(ApiReturn {
ok: true,
message: "Question deleted".to_string(),
payload: (),
}),
Err(e) => Json(e.into()),
}
}

25
crates/app/src/routes/api/v1/mod.rs
View file

@ -3,6 +3,7 @@ pub mod communities;
pub mod notifications;
pub mod reactions;
pub mod reports;
pub mod requests;
pub mod util;
use axum::{
@ -93,6 +94,12 @@ pub fn routes() -> Router {
"/posts/{id}/context",
post(communities::posts::update_context_request),
)
// questions
.route("/questions", post(communities::questions::create_request))
.route(
"/questions/{id}",
delete(communities::questions::delete_request),
)
// auth
// global
.route("/auth/register", post(auth::register_request))
@ -201,6 +208,12 @@ pub fn routes() -> Router {
// reports
.route("/reports", post(reports::create_request))
.route("/reports/{id}", delete(reports::delete_request))
// requests
.route(
"/requests/{id}/{linked_asset}",
delete(requests::delete_request),
)
.route("/requests/my", delete(requests::delete_all_request))
}
#[derive(Deserialize)]
@ -255,6 +268,8 @@ pub struct CreatePost {
pub community: String,
#[serde(default)]
pub replying_to: Option<String>,
#[serde(default)]
pub answering: String,
}
#[derive(Deserialize)]
@ -337,3 +352,13 @@ pub struct DisableTotp {
pub struct CreateUserWarning {
pub content: String,
}
#[derive(Deserialize)]
pub struct CreateQuestion {
pub content: String,
pub is_global: bool,
#[serde(default)]
pub receiver: String,
#[serde(default)]
pub community: String,
}

45
crates/app/src/routes/api/v1/requests.rs Normal file
View file

@ -0,0 +1,45 @@
use crate::{State, get_user_from_token};
use axum::{Extension, Json, extract::Path, response::IntoResponse};
use axum_extra::extract::CookieJar;
use tetratto_core::model::{ApiReturn, Error};
pub async fn delete_request(
jar: CookieJar,
Extension(data): Extension<State>,
Path((id, linked_asset)): Path<(usize, usize)>,
) -> 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.delete_request(id, linked_asset, &user).await {
Ok(_) => Json(ApiReturn {
ok: true,
message: "Request deleted".to_string(),
payload: (),
}),
Err(e) => Json(e.into()),
}
}
pub async fn delete_all_request(
jar: CookieJar,
Extension(data): Extension<State>,
) -> 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.delete_all_requests(&user).await {
Ok(_) => Json(ApiReturn {
ok: true,
message: "Requests cleared".to_string(),
payload: (),
}),
Err(e) => Json(e.into()),
}
}

205
crates/app/src/routes/pages/communities.rs
View file

@ -362,6 +362,93 @@ pub async fn feed_request(
))
}
/// `/community/{title}/questions`
pub async fn questions_request(
jar: CookieJar,
Path(title): Path<String>,
Query(props): Query<PaginatedQuery>,
Extension(data): Extension<State>,
) -> impl IntoResponse {
let data = data.read().await;
let user = get_user_from_token!(jar, data.0);
let community = match data.0.get_community_by_title(&title.to_lowercase()).await {
Ok(ua) => ua,
Err(e) => return Err(Html(render_error(e, &jar, &data, &user).await)),
};
if community.id == 0 {
// don't show page for void community
return Err(Html(
render_error(
Error::GeneralNotFound("community".to_string()),
&jar,
&data,
&user,
)
.await,
));
}
if !community.context.enable_questions {
return Err(Html(
render_error(Error::NotAllowed, &jar, &data, &user).await,
));
}
// check permissions
let (can_read, _) = check_permissions!(community, jar, data, user);
// ...
let feed = match data
.0
.get_questions_by_community(community.id, 12, props.page)
.await
{
Ok(p) => match data.0.fill_questions(p).await {
Ok(p) => p,
Err(e) => return Err(Html(render_error(e, &jar, &data, &user).await)),
},
Err(e) => return Err(Html(render_error(e, &jar, &data, &user).await)),
};
// init context
let lang = get_lang!(jar, data.0);
let mut context = initial_context(&data.0.0, lang, &user).await;
let (
is_owner,
is_joined,
is_pending,
can_post,
can_manage_posts,
can_manage_community,
can_manage_roles,
) = community_context_bools!(data, user, community);
context.insert("feed", &feed);
context.insert("page", &props.page);
community_context(
&mut context,
&community,
is_owner,
is_joined,
is_pending,
can_post,
can_read,
can_manage_posts,
can_manage_community,
can_manage_roles,
);
// return
Ok(Html(
data.1
.render("communities/questions.html", &context)
.unwrap(),
))
}
/// `/community/{id}/manage`
pub async fn settings_request(
jar: CookieJar,
@ -440,26 +527,12 @@ pub async fn post_request(
};
// check repost
let reposting = if let Some(ref repost) = post.context.repost {
if let Some(reposting) = repost.reposting {
let mut x = match data.0.get_post_by_id(reposting).await {
Ok(p) => p,
Err(e) => return Err(Html(render_error(e, &jar, &data, &user).await)),
};
let reposting = data.0.get_post_reposting(&post).await;
x.mark_as_repost();
Some((
match data.0.get_user_by_id(x.owner).await {
Ok(ua) => ua,
Err(e) => return Err(Html(render_error(e, &jar, &data, &user).await)),
},
x,
))
} else {
None
}
} else {
None
// check question
let question = match data.0.get_post_question(&post).await {
Ok(q) => q,
Err(e) => return Err(Html(render_error(e, &jar, &data, &user).await)),
};
// check permissions
@ -490,6 +563,7 @@ pub async fn post_request(
context.insert("post", &post);
context.insert("reposting", &reposting);
context.insert("question", &question);
context.insert("replies", &feed);
context.insert("page", &props.page);
context.insert(
@ -612,3 +686,96 @@ pub async fn members_request(
data.1.render("communities/members.html", &context).unwrap(),
))
}
/// `/question/{id}`
pub async fn question_request(
jar: CookieJar,
Path(id): Path<usize>,
Query(props): Query<PaginatedQuery>,
Extension(data): Extension<State>,
) -> impl IntoResponse {
let data = data.read().await;
let user = get_user_from_token!(jar, data.0);
let question = match data.0.get_question_by_id(id).await {
Ok(p) => p,
Err(e) => return Err(Html(render_error(e, &jar, &data, &user).await)),
};
let community = match data.0.get_community_by_id(question.community).await {
Ok(c) => c,
Err(e) => return Err(Html(render_error(e, &jar, &data, &user).await)),
};
let has_answered = if let Some(ref ua) = user {
data.0
.get_post_by_owner_question(ua.id, question.id)
.await
.is_ok()
} else {
false
};
// check permissions
let (can_read, _) = check_permissions!(community, jar, data, user);
// ...
let feed = match data
.0
.get_posts_by_question(question.id, 12, props.page)
.await
{
Ok(p) => match data.0.fill_posts(p).await {
Ok(p) => p,
Err(e) => return Err(Html(render_error(e, &jar, &data, &user).await)),
},
Err(e) => return Err(Html(render_error(e, &jar, &data, &user).await)),
};
// init context
let lang = get_lang!(jar, data.0);
let mut context = initial_context(&data.0.0, lang, &user).await;
let (
is_owner,
is_joined,
is_pending,
can_post,
can_manage_posts,
can_manage_community,
can_manage_roles,
) = community_context_bools!(data, user, community);
context.insert("question", &question);
context.insert("replies", &feed);
context.insert("page", &props.page);
context.insert(
"owner",
&data
.0
.get_user_by_id(question.owner)
.await
.unwrap_or(User::deleted()),
);
context.insert("has_answered", &has_answered);
community_context(
&mut context,
&community,
is_owner,
is_joined,
is_pending,
can_post,
can_read,
can_manage_posts,
can_manage_community,
can_manage_roles,
);
// return
Ok(Html(
data.1
.render("communities/question.html", &context)
.unwrap(),
))
}

55
crates/app/src/routes/pages/misc.rs
View file

@ -6,7 +6,7 @@ use axum::{
Extension,
};
use axum_extra::extract::CookieJar;
use tetratto_core::model::Error;
use tetratto_core::model::{requests::ActionType, Error};
use std::fs::read_to_string;
use pathbufd::PathBufD;
@ -188,6 +188,59 @@ pub async fn notifications_request(
))
}
/// `/requests`
pub async fn requests_request(
jar: CookieJar,
Extension(data): Extension<State>,
) -> impl IntoResponse {
let data = data.read().await;
let user = match get_user_from_token!(jar, data.0) {
Some(ua) => ua,
None => {
return Err(Html(
render_error(Error::NotAllowed, &jar, &data, &None).await,
));
}
};
let requests = match data.0.get_requests_by_owner(user.id).await {
Ok(p) => p,
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
};
let questions = match data
.0
.fill_questions({
let mut q = Vec::new();
for req in &requests {
if req.action_type != ActionType::Answer {
continue;
}
q.push(match data.0.get_question_by_id(req.linked_asset).await {
Ok(p) => p,
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
});
}
q
})
.await
{
Ok(q) => q,
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
};
let lang = get_lang!(jar, data.0);
let mut context = initial_context(&data.0.0, lang, &Some(user)).await;
context.insert("requests", &requests);
context.insert("questions", &questions);
// return
Ok(Html(data.1.render("misc/requests.html", &context).unwrap()))
}
/// `/doc/{file_name}`
pub async fn markdown_document_request(
jar: CookieJar,

6
crates/app/src/routes/pages/mod.rs
View file

@ -22,6 +22,7 @@ pub fn routes() -> Router {
.route("/following", get(misc::following_request))
.route("/all", get(misc::all_request))
.route("/notifs", get(misc::notifications_request))
.route("/requests", get(misc::requests_request))
.route("/doc/{*file_name}", get(misc::markdown_document_request))
.fallback_service(get(misc::not_found))
// mod
@ -56,12 +57,17 @@ pub fn routes() -> Router {
get(communities::create_post_request),
)
.route("/community/{title}", get(communities::feed_request))
.route(
"/community/{title}/questions",
get(communities::questions_request),
)
.route("/community/{id}/manage", get(communities::settings_request))
.route(
"/community/{title}/members",
get(communities::members_request),
)
.route("/post/{id}", get(communities::post_request))
.route("/question/{id}", get(communities::question_request))
}
pub async fn render_error(