grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Mark follow as pending when subscribing to remote community (fixes #3384) (#3406)

Browse source
This commit is contained in:
Nutomic 2023-07-03 12:03:20 +02:00 committed by GitHub
parent fc60b82f82
commit 6405761891
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
crates/api/src/community/follow.rs
View file

@ -26,19 +26,27 @@ impl Perform for FollowCommunity {
let community_id = data.community_id; let community_id = data.community_id;
let community = Community::read(context.pool(), community_id).await?; let community = Community::read(context.pool(), community_id).await?;
let community_follower_form = CommunityFollowerForm { let mut community_follower_form = CommunityFollowerForm {
community_id: data.community_id, community_id: data.community_id,
person_id: local_user_view.person.id, person_id: local_user_view.person.id,
pending: false, pending: false,
}; };
if community.local && data.follow { if data.follow {
check_community_ban(local_user_view.person.id, community_id, context.pool()).await?; if community.local {
check_community_deleted_or_removed(community_id, context.pool()).await?; check_community_ban(local_user_view.person.id, community_id, context.pool()).await?;
check_community_deleted_or_removed(community_id, context.pool()).await?;
CommunityFollower::follow(context.pool(), &community_follower_form) CommunityFollower::follow(context.pool(), &community_follower_form)
.await .await
.map_err(|e| LemmyError::from_error_message(e, "community_follower_already_exists"))?; .map_err(|e| LemmyError::from_error_message(e, "community_follower_already_exists"))?;
} else {
// Mark as pending, the actual federation activity is sent via `SendActivity` handler
community_follower_form.pending = true;
CommunityFollower::follow(context.pool(), &community_follower_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "community_follower_already_exists"))?;
}
} }
if !data.follow { if !data.follow {
CommunityFollower::unfollow(context.pool(), &community_follower_form) CommunityFollower::unfollow(context.pool(), &community_follower_form)