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

Always add primary recipients to "to" array

Browse source
This commit is contained in:
silverpill 2021-12-25 00:05:17 +00:00
parent 81a260e691
commit 492b18a43a
2 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/activitypub/activity.rs
View file

@ -256,6 +256,7 @@ pub fn create_activity_like(
actor_profile: &DbActorProfile,
note_id: &str,
reaction_id: &Uuid,
recipient_id: &str,
) -> Activity {
let activity = create_activity(
instance_url,
@ -263,7 +264,7 @@ pub fn create_activity_like(
LIKE,
Some(reaction_id),
note_id,
vec![AP_PUBLIC.to_string()],
vec![AP_PUBLIC.to_string(), recipient_id.to_string()],
);
activity
}
@ -272,6 +273,7 @@ pub fn create_activity_undo_like(
instance_url: &str,
actor_profile: &DbActorProfile,
reaction_id: &Uuid,
recipient_id: &str,
) -> Activity {
let object_id = get_object_url(
instance_url,
@ -283,7 +285,7 @@ pub fn create_activity_undo_like(
UNDO,
None,
object_id,
vec![AP_PUBLIC.to_string()],
vec![AP_PUBLIC.to_string(), recipient_id.to_string()],
)
}
@ -294,13 +296,14 @@ pub fn create_activity_announce(
repost_id: &Uuid,
) -> Activity {
let object_id = post.get_object_id(instance_url);
let recipient_id = post.author.actor_id(instance_url).unwrap();
let activity = create_activity(
instance_url,
&actor_profile.username,
ANNOUNCE,
Some(repost_id),
object_id,
vec![AP_PUBLIC.to_string()],
vec![AP_PUBLIC.to_string(), recipient_id],
);
activity
}
@ -309,18 +312,23 @@ pub fn create_activity_undo_announce(
instance_url: &str,
actor_profile: &DbActorProfile,
repost_id: &Uuid,
recipient_id: Option<&String>,
) -> Activity {
let object_id = get_object_url(
instance_url,
repost_id,
);
let mut recipients = vec![AP_PUBLIC.to_string()];
if let Some(recipient_id) = recipient_id {
recipients.push(recipient_id.to_string());
};
create_activity(
instance_url,
&actor_profile.username,
UNDO,
None,
object_id,
vec![AP_PUBLIC.to_string()],
recipients,
)
}
@ -337,13 +345,20 @@ pub fn create_activity_delete_note(
former_type: Some(NOTE.to_string()),
..Default::default()
};
let mut recipients = vec![AP_PUBLIC.to_string()];
for profile in &post.mentions {
let actor_id = profile.actor_id(instance_url).unwrap();
if !profile.is_local() {
recipients.push(actor_id);
};
};
let activity = create_activity(
instance_url,
&actor_profile.username,
DELETE,
None,
object,
vec![AP_PUBLIC.to_string()],
recipients,
);
activity
}

15
src/mastodon_api/statuses/views.rs
View file

@ -258,6 +258,7 @@ async fn favourite(
&current_user.profile,
object_id,
&reaction.id,
&remote_actor.id,
);
deliver_activity(&config, &current_user, activity, vec![remote_actor]);
}
@ -302,6 +303,7 @@ async fn unfavourite(
&config.instance_url(),
&current_user.profile,
&reaction_id,
&remote_actor.id,
);
deliver_activity(&config, &current_user, activity, vec![remote_actor]);
};
@ -374,11 +376,7 @@ async fn unreblog(
get_actions_for_posts(db_client, &current_user.id, vec![&mut post]).await?;
// Federate
let activity = create_activity_undo_announce(
&config.instance_url(),
&current_user.profile,
&repost_id,
);
let mut primary_recipient = None;
let mut recipients: Vec<Actor> = Vec::new();
let followers = get_followers(db_client, &current_user.id).await?;
for follower in followers {
@ -391,8 +389,15 @@ async fn unreblog(
let maybe_remote_author = post.author.remote_actor()
.map_err(|_| HttpError::InternalError)?;
if let Some(remote_actor) = maybe_remote_author {
primary_recipient = Some(remote_actor.id.clone());
recipients.push(remote_actor);
};
let activity = create_activity_undo_announce(
&config.instance_url(),
&current_user.profile,
&repost_id,
primary_recipient.as_ref(),
);
deliver_activity(&config, &current_user, activity, recipients);
let status = Status::from_post(post, &config.instance_url());