From de1760230ad02f7117739135d3d8d63edeeb16a5 Mon Sep 17 00:00:00 2001 From: silverpill Date: Tue, 4 Jan 2022 21:50:18 +0000 Subject: [PATCH] Set primary audience of Delete(Note) activities to Public --- src/activitypub/activity.rs | 12 ++---------- src/mastodon_api/statuses/views.rs | 1 - 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/activitypub/activity.rs b/src/activitypub/activity.rs index 498cfdf..ffef896 100644 --- a/src/activitypub/activity.rs +++ b/src/activitypub/activity.rs @@ -343,7 +343,6 @@ pub fn create_activity_undo_announce( pub fn create_activity_delete_note( instance_url: &str, - actor_profile: &DbActorProfile, post: &Post, ) -> Activity { let object_id = post.get_object_id(instance_url); @@ -354,20 +353,13 @@ 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); - if !profile.is_local() { - recipients.push(actor_id); - }; - }; let activity = create_activity( instance_url, - &actor_profile.username, + &post.author.username, DELETE, None, object, - recipients, + vec![AP_PUBLIC.to_string()], vec![], ); activity diff --git a/src/mastodon_api/statuses/views.rs b/src/mastodon_api/statuses/views.rs index 1889a66..4951a11 100644 --- a/src/mastodon_api/statuses/views.rs +++ b/src/mastodon_api/statuses/views.rs @@ -147,7 +147,6 @@ async fn delete_status( let activity = create_activity_delete_note( &config.instance_url(), - ¤t_user.profile, &post, ); let recipients = get_note_audience(db_client, ¤t_user, &post).await?;