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

add: user settings following page

Browse source 
add: comments to be seen by owner of the post they're on (even if the owner is private)
This commit is contained in:
trisua 2025-05-18 14:47:24 -04:00
parent fa1a609bf5
commit b8b0ef7f21
4 changed files with 154 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -666,8 +666,6 @@ pub async fn post_request(
Err(e) => return Err(Html(render_error(e, &jar, &data, &user).await)),
};
check_user_blocked_or_private!(user, owner, data, jar);
if owner.permissions.check_banned() {
if let Some(ref ua) = user {
if !ua.permissions.check(FinePermission::MANAGE_POSTS) {
@ -682,6 +680,27 @@ pub async fn post_request(
}
}
// check if the user has a private account OR if we're blocked...
// don't do this check if we're the owner of the post this post is replying to
if let Some(ref ua) = user {
if let Some(replying) = post.replying_to {
if replying != 0 {
let replying_to = match data.0.get_post_by_id(replying).await {
Ok(r) => r,
Err(e) => return Err(Html(render_error(e, &jar, &data, &user).await)),
};
if replying_to.owner != ua.id {
check_user_blocked_or_private!(user, owner, data, jar);
}
} else {
check_user_blocked_or_private!(user, owner, data, jar);
}
}
} else {
check_user_blocked_or_private!(user, owner, data, jar);
}
// check repost
let reposting = data.0.get_post_reposting(&post, &ignore_users, &user).await;

15
crates/app/src/routes/pages/profile.rs
View file

@ -57,6 +57,20 @@ pub async fn settings_request(
}
};
let following = match data
.0
.fill_userfollows_with_receiver(
data.0
.get_userfollows_by_initiator_all(profile.id)
.await
.unwrap_or(Vec::new()),
)
.await
{
Ok(r) => r,
Err(e) => return Err(Html(render_error(e, &jar, &data, &None).await)),
};
let blocks = match data
.0
.fill_userblocks_receivers(data.0.get_userblocks_by_initiator(profile.id).await)
@ -82,6 +96,7 @@ pub async fn settings_request(
context.insert("page", &req.page);
context.insert("uploads", &uploads);
context.insert("stacks", &stacks);
context.insert("following", &following);
context.insert("blocks", &blocks);
context.insert(
"user_tokens_serde",