add: circle stacks
This commit is contained in:
parent
50704d27a9
commit
56cea83933
27 changed files with 419 additions and 107 deletions
|
@ -124,6 +124,10 @@ pub async fn create_request(
|
|||
};
|
||||
} else {
|
||||
props.title = req.title;
|
||||
props.stack = match req.stack.parse::<usize>() {
|
||||
Ok(x) => x,
|
||||
Err(e) => return Json(Error::MiscError(e.to_string()).into()),
|
||||
};
|
||||
}
|
||||
|
||||
// check sizes
|
||||
|
@ -197,18 +201,23 @@ pub async fn create_repost_request(
|
|||
None => return Json(Error::NotAllowed.into()),
|
||||
};
|
||||
|
||||
match data
|
||||
.create_post(Post::repost(
|
||||
req.content,
|
||||
match req.community.parse::<usize>() {
|
||||
Ok(x) => x,
|
||||
Err(e) => return Json(Error::MiscError(e.to_string()).into()),
|
||||
},
|
||||
user.id,
|
||||
id,
|
||||
))
|
||||
.await
|
||||
{
|
||||
let mut props = Post::repost(
|
||||
req.content,
|
||||
match req.community.parse::<usize>() {
|
||||
Ok(x) => x,
|
||||
Err(e) => return Json(Error::MiscError(e.to_string()).into()),
|
||||
},
|
||||
user.id,
|
||||
id,
|
||||
);
|
||||
|
||||
props.stack = match req.stack.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 reposted".to_string(),
|
||||
|
|
|
@ -616,12 +616,15 @@ pub struct CreatePost {
|
|||
pub poll: Option<CreatePostPoll>,
|
||||
#[serde(default)]
|
||||
pub title: String,
|
||||
#[serde(default)]
|
||||
pub stack: String,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct CreateRepost {
|
||||
pub content: String,
|
||||
pub community: String,
|
||||
pub stack: String,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
|
|
|
@ -5,11 +5,14 @@ use axum::{
|
|||
Extension, Json,
|
||||
};
|
||||
use axum_extra::extract::CookieJar;
|
||||
use tetratto_core::model::{
|
||||
oauth,
|
||||
permissions::FinePermission,
|
||||
stacks::{StackBlock, StackPrivacy, UserStack},
|
||||
ApiReturn, Error,
|
||||
use tetratto_core::{
|
||||
model::{
|
||||
oauth,
|
||||
permissions::FinePermission,
|
||||
stacks::{StackBlock, StackMode, StackPrivacy, UserStack},
|
||||
ApiReturn, Error,
|
||||
},
|
||||
DataManager,
|
||||
};
|
||||
use super::{
|
||||
AddOrRemoveStackUser, CreateStack, UpdateStackMode, UpdateStackName, UpdateStackPrivacy,
|
||||
|
@ -161,6 +164,25 @@ pub async fn add_user_request(
|
|||
};
|
||||
|
||||
stack.users.push(other_user.id);
|
||||
|
||||
// check number of stacks
|
||||
let owner = match data.get_user_by_id(stack.owner).await {
|
||||
Ok(ua) => ua,
|
||||
Err(e) => return Json(e.into()),
|
||||
};
|
||||
|
||||
if !owner.permissions.check(FinePermission::SUPPORTER) {
|
||||
if stack.users.len() >= DataManager::MAXIMUM_FREE_STACK_USERS {
|
||||
return Json(
|
||||
Error::MiscError(
|
||||
"This stack already has the maximum users it can have".to_string(),
|
||||
)
|
||||
.into(),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// ...
|
||||
match data.update_stack_users(id, &user, stack.users).await {
|
||||
Ok(_) => Json(ApiReturn {
|
||||
ok: true,
|
||||
|
@ -250,6 +272,7 @@ pub async fn get_users_request(
|
|||
|
||||
if stack.privacy == StackPrivacy::Private
|
||||
&& user.id != stack.owner
|
||||
&& !(stack.mode == StackMode::Circle && stack.users.contains(&user.id))
|
||||
&& !user.permissions.check(FinePermission::MANAGE_STACKS)
|
||||
{
|
||||
return Json(Error::NotAllowed.into());
|
||||
|
|
|
@ -11,8 +11,12 @@ use axum_extra::extract::CookieJar;
|
|||
use serde::Deserialize;
|
||||
use tera::Context;
|
||||
use tetratto_core::model::{
|
||||
auth::User, communities::Community, communities_permissions::CommunityPermission,
|
||||
permissions::FinePermission, Error,
|
||||
auth::User,
|
||||
communities::Community,
|
||||
communities_permissions::CommunityPermission,
|
||||
permissions::FinePermission,
|
||||
stacks::{StackMode, UserStack},
|
||||
Error,
|
||||
};
|
||||
|
||||
#[macro_export]
|
||||
|
@ -245,6 +249,8 @@ pub struct CreatePostProps {
|
|||
#[serde(default)]
|
||||
pub community: usize,
|
||||
#[serde(default)]
|
||||
pub stack: usize,
|
||||
#[serde(default)]
|
||||
pub from_draft: usize,
|
||||
#[serde(default)]
|
||||
pub quote: usize,
|
||||
|
@ -286,6 +292,16 @@ pub async fn create_post_request(
|
|||
communities.push(community)
|
||||
}
|
||||
|
||||
let stacks = match data.0.get_stacks_by_user(user.id).await {
|
||||
Ok(s) => s,
|
||||
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
|
||||
};
|
||||
|
||||
let stacks: Vec<&UserStack> = stacks
|
||||
.iter()
|
||||
.filter(|x| x.mode == StackMode::Circle)
|
||||
.collect();
|
||||
|
||||
// get draft
|
||||
let draft = if props.from_draft != 0 {
|
||||
match data.0.get_draft_by_id(props.from_draft).await {
|
||||
|
@ -326,8 +342,10 @@ pub async fn create_post_request(
|
|||
|
||||
context.insert("draft", &draft);
|
||||
context.insert("drafts", &drafts);
|
||||
context.insert("stacks", &stacks);
|
||||
context.insert("quoting", "ing);
|
||||
context.insert("communities", &communities);
|
||||
context.insert("selected_stack", &props.stack);
|
||||
context.insert("selected_community", &props.community);
|
||||
|
||||
// return
|
||||
|
@ -663,6 +681,28 @@ pub async fn post_request(
|
|||
}
|
||||
}
|
||||
|
||||
// check stack
|
||||
if post.stack != 0 {
|
||||
let stack = match data.0.get_stack_by_id(post.stack).await {
|
||||
Ok(c) => c,
|
||||
Err(e) => return Err(Html(render_error(e, &jar, &data, &user).await)),
|
||||
};
|
||||
|
||||
if let Some(ref ua) = user {
|
||||
if (stack.owner != ua.id) && !stack.users.contains(&ua.id) {
|
||||
return Err(Html(
|
||||
render_error(Error::NotAllowed, &jar, &data, &user).await,
|
||||
));
|
||||
}
|
||||
} else {
|
||||
// we MUST be authenticated to view posts in a stack
|
||||
return Err(Html(
|
||||
render_error(Error::NotAllowed, &jar, &data, &user).await,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
// ...
|
||||
let community = match data.0.get_community_by_id(post.community).await {
|
||||
Ok(c) => c,
|
||||
Err(e) => return Err(Html(render_error(e, &jar, &data, &user).await)),
|
||||
|
|
|
@ -50,7 +50,7 @@ pub async fn settings_request(
|
|||
}
|
||||
};
|
||||
|
||||
let stacks = match data.0.get_stacks_by_owner(profile.id).await {
|
||||
let stacks = match data.0.get_stacks_by_user(profile.id).await {
|
||||
Ok(ua) => ua,
|
||||
Err(e) => {
|
||||
return Err(Html(render_error(e, &jar, &data, &None).await));
|
||||
|
|
|
@ -25,7 +25,7 @@ pub async fn list_request(jar: CookieJar, Extension(data): Extension<State>) ->
|
|||
}
|
||||
};
|
||||
|
||||
let list = match data.0.get_stacks_by_owner(user.id).await {
|
||||
let list = match data.0.get_stacks_by_user(user.id).await {
|
||||
Ok(p) => p,
|
||||
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
|
||||
};
|
||||
|
@ -63,6 +63,7 @@ pub async fn feed_request(
|
|||
|
||||
if stack.privacy == StackPrivacy::Private
|
||||
&& user.id != stack.owner
|
||||
&& !(stack.mode == StackMode::Circle && stack.users.contains(&user.id))
|
||||
&& !user.permissions.check(FinePermission::MANAGE_STACKS)
|
||||
{
|
||||
return Err(Html(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue