FediMovies/fedimovies
1
1
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Activity

Ignore Accept(Follow) if follow request is already accepted

Browse source
This commit is contained in:
silverpill 2022-09-12 23:36:35 +00:00
parent d0f97a33b3
commit 9aafe0eaf4
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/activitypub/handlers/accept_follow.rs
View file

@ -13,6 +13,7 @@ use crate::models::relationships::queries::{
follow_request_accepted, follow_request_accepted,
get_follow_request_by_id, get_follow_request_by_id,
}; };
use crate::models::relationships::types::FollowRequestStatus;
use super::HandlerResult; use super::HandlerResult;
pub async fn handle_accept_follow( pub async fn handle_accept_follow(
@ -30,6 +31,10 @@ pub async fn handle_accept_follow(
if follow_request.target_id != actor_profile.id { if follow_request.target_id != actor_profile.id {
return Err(ValidationError("actor is not a target").into()); return Err(ValidationError("actor is not a target").into());
}; };
if matches!(follow_request.request_status, FollowRequestStatus::Accepted) {
// Ignore Accept if follow request already accepted
return Ok(None);
};
follow_request_accepted(db_client, &follow_request_id).await?; follow_request_accepted(db_client, &follow_request_id).await?;
Ok(Some(FOLLOW)) Ok(Some(FOLLOW))
} }

5
src/activitypub/handlers/reject_follow.rs
View file

@ -13,6 +13,7 @@ use crate::models::relationships::queries::{
follow_request_rejected, follow_request_rejected,
get_follow_request_by_id, get_follow_request_by_id,
}; };
use crate::models::relationships::types::FollowRequestStatus;
use super::HandlerResult; use super::HandlerResult;
pub async fn handle_reject_follow( pub async fn handle_reject_follow(
@ -30,6 +31,10 @@ pub async fn handle_reject_follow(
if follow_request.target_id != actor_profile.id { if follow_request.target_id != actor_profile.id {
return Err(ValidationError("actor is not a target").into()); return Err(ValidationError("actor is not a target").into());
}; };
if matches!(follow_request.request_status, FollowRequestStatus::Rejected) {
// Ignore Reject if follow request already rejected
return Ok(None);
};
follow_request_rejected(db_client, &follow_request_id).await?; follow_request_rejected(db_client, &follow_request_id).await?;
Ok(Some(FOLLOW)) Ok(Some(FOLLOW))
} }