Move get_note_recipients() to builders::create_note module

src/activitypub/builders/create_note.rs

@@ -1,14 +1,22 @@
 use chrono::{DateTime, Utc};
 use serde::Serialize;
+use tokio_postgres::GenericClient;
 
 use crate::activitypub::{
     activity::{create_activity, Activity, Attachment, Tag},
+    actor::Actor,
     constants::{AP_CONTEXT, AP_PUBLIC},
+    deliverer::OutgoingActivity,
     views::{get_actor_url, get_followers_url, get_object_url, get_subscribers_url},
     vocabulary::{CREATE, DOCUMENT, HASHTAG, MENTION, NOTE},
 };
+use crate::config::Instance;
+use crate::errors::DatabaseError;
 use crate::frontend::get_tag_page_url;
+use crate::models::posts::queries::get_post_author;
 use crate::models::posts::types::{Post, Visibility};
+use crate::models::relationships::queries::{get_followers, get_subscribers};
+use crate::models::users::types::User;
 use crate::utils::files::get_file_url;
 
 #[derive(Serialize)]
@@ -152,10 +160,63 @@ pub fn build_create_note(
     activity
 }
 
+pub async fn get_note_recipients(
+    db_client: &impl GenericClient,
+    current_user: &User,
+    post: &Post,
+) -> Result<Vec<Actor>, DatabaseError> {
+    let mut audience = vec![];
+    match post.visibility {
+        Visibility::Public | Visibility::Followers => {
+            let followers = get_followers(db_client, &current_user.id, None, None).await?;
+            audience.extend(followers);
+        },
+        Visibility::Subscribers => {
+            let subscribers = get_subscribers(db_client, &current_user.id).await?;
+            audience.extend(subscribers);
+        },
+        Visibility::Direct => (),
+    };
+    if let Some(in_reply_to_id) = post.in_reply_to_id {
+        // TODO: use post.in_reply_to ?
+        let in_reply_to_author = get_post_author(db_client, &in_reply_to_id).await?;
+        audience.push(in_reply_to_author);
+    };
+    audience.extend(post.mentions.clone());
+
+    let mut recipients: Vec<Actor> = Vec::new();
+    for profile in audience {
+        if let Some(remote_actor) = profile.actor_json {
+            recipients.push(remote_actor);
+        };
+    };
+    Ok(recipients)
+}
+
+pub async fn prepare_create_note(
+    db_client: &impl GenericClient,
+    instance: Instance,
+    author: &User,
+    post: &Post,
+) -> Result<OutgoingActivity, DatabaseError> {
+    assert_eq!(author.id, post.author.id);
+    let activity = build_create_note(
+        &instance.host(),
+        &instance.url(),
+        post,
+    );
+    let recipients = get_note_recipients(db_client, author, post).await?;
+    Ok(OutgoingActivity {
+        instance,
+        sender: author.clone(),
+        activity,
+        recipients,
+    })
+}
+
 #[cfg(test)]
 mod tests {
     use serde_json::json;
-    use crate::activitypub::actor::Actor;
     use crate::models::profiles::types::DbActorProfile;
     use super::*;
 

src/activitypub/builders/delete_note.rs

@@ -7,9 +7,9 @@ use crate::activitypub::deliverer::OutgoingActivity;
 use crate::activitypub::vocabulary::{DELETE, NOTE, TOMBSTONE};
 use crate::config::Instance;
 use crate::errors::DatabaseError;
-use crate::mastodon_api::statuses::helpers::get_note_recipients;
 use crate::models::posts::types::Post;
 use crate::models::users::types::User;
+use super::create_note::get_note_recipients;
 
 fn build_delete_note(
     instance_url: &str,

src/mastodon_api/statuses/helpers.rs

@@ -6,45 +6,11 @@ use crate::models::posts::helpers::{
     add_user_actions,
     add_reposted_posts,
 };
-use crate::models::posts::queries::get_post_author;
+use crate::models::posts::types::Post;
-use crate::models::posts::types::{Post, Visibility};
+use crate::models::relationships::queries::get_followers;
-use crate::models::relationships::queries::{get_followers, get_subscribers};
 use crate::models::users::types::User;
 use super::types::Status;
 
-pub async fn get_note_recipients(
-    db_client: &impl GenericClient,
-    current_user: &User,
-    post: &Post,
-) -> Result<Vec<Actor>, DatabaseError> {
-    let mut audience = vec![];
-    match post.visibility {
-        Visibility::Public | Visibility::Followers => {
-            let followers = get_followers(db_client, &current_user.id, None, None).await?;
-            audience.extend(followers);
-        },
-        Visibility::Subscribers => {
-            let subscribers = get_subscribers(db_client, &current_user.id).await?;
-            audience.extend(subscribers);
-        },
-        Visibility::Direct => (),
-    };
-    if let Some(in_reply_to_id) = post.in_reply_to_id {
-        // TODO: use post.in_reply_to ?
-        let in_reply_to_author = get_post_author(db_client, &in_reply_to_id).await?;
-        audience.push(in_reply_to_author);
-    };
-    audience.extend(post.mentions.clone());
-
-    let mut recipients: Vec<Actor> = Vec::new();
-    for profile in audience {
-        if let Some(remote_actor) = profile.actor_json {
-            recipients.push(remote_actor);
-        };
-    };
-    Ok(recipients)
-}
-
 pub struct Audience {
     pub recipients: Vec<Actor>,
     pub primary_recipient: String,

src/mastodon_api/statuses/views.rs

@@ -11,7 +11,7 @@ use crate::activitypub::activity::{
     create_activity_announce,
     create_activity_undo_announce,
 };
-use crate::activitypub::builders::create_note::build_create_note;
+use crate::activitypub::builders::create_note::prepare_create_note;
 use crate::activitypub::builders::delete_note::prepare_delete_note;
 use crate::activitypub::deliverer::deliver_activity;
 use crate::config::Config;
@@ -44,7 +44,6 @@ use super::helpers::{
     build_status_list,
     get_announce_recipients,
     get_like_recipients,
-    get_note_recipients,
     Audience,
 };
 use super::types::{Status, StatusData, TransactionData};
@@ -119,13 +118,8 @@ async fn create_status(
         Box::new(in_reply_to)
     });
     // Federate
-    let activity = build_create_note(
+    prepare_create_note(db_client, config.instance(), &current_user, &post).await?
-        &instance.host(),
+        .spawn_deliver();
-        &instance.url(),
-        &post,
-    );
-    let recipients = get_note_recipients(db_client, &current_user, &post).await?;
-    deliver_activity(&config, &current_user, activity, recipients);
 
     let status = Status::from_post(post, &instance.url());
     Ok(HttpResponse::Created().json(status))