add: circle stacks

This commit is contained in:
trisua 2025-06-15 16:09:02 -04:00
parent 50704d27a9
commit 56cea83933
27 changed files with 419 additions and 107 deletions

View file

@ -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(),

View file

@ -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)]

View file

@ -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());