Move Like() activity handler to inbox::like module

src/activitypub/handlers/like.rs

@@ -0,0 +1,51 @@
+use tokio_postgres::GenericClient;
+
+use crate::activitypub::{
+    activity::Activity,
+    fetcher::helpers::get_or_import_profile_by_actor_id,
+    receiver::{get_object_id, parse_object_id},
+    vocabulary::NOTE,
+};
+use crate::config::Config;
+use crate::errors::DatabaseError;
+use crate::models::reactions::queries::create_reaction;
+use crate::models::posts::queries::get_post_by_object_id;
+use super::HandlerResult;
+
+pub async fn handle_like(
+    config: &Config,
+    db_client: &mut impl GenericClient,
+    activity: Activity,
+) -> HandlerResult {
+    let author = get_or_import_profile_by_actor_id(
+        db_client,
+        &config.instance(),
+        &config.media_dir(),
+        &activity.actor,
+    ).await?;
+    let object_id = get_object_id(&activity.object)?;
+    let post_id = match parse_object_id(&config.instance_url(), &object_id) {
+        Ok(post_id) => post_id,
+        Err(_) => {
+            let post = match get_post_by_object_id(db_client, &object_id).await {
+                Ok(post) => post,
+                // Ignore like if post is not found locally
+                Err(DatabaseError::NotFound(_)) => return Ok(None),
+                Err(other_error) => return Err(other_error.into()),
+            };
+            post.id
+        },
+    };
+    match create_reaction(
+        db_client,
+        &author.id,
+        &post_id,
+        Some(&activity.id),
+    ).await {
+        Ok(_) => (),
+        // Ignore activity if reaction is already saved
+        Err(DatabaseError::AlreadyExists(_)) => return Ok(None),
+        Err(other_error) => return Err(other_error.into()),
+    };
+    Ok(Some(NOTE))
+}

src/activitypub/handlers/mod.rs

@@ -6,5 +6,6 @@ pub type HandlerResult = Result<Option<&'static str>, ImportError>;
 pub mod announce;
 pub mod create_note;
 pub mod delete;
+pub mod like;
 pub mod update_note;
 pub mod update_person;

src/activitypub/receiver.rs

@@ -17,7 +17,6 @@ use crate::models::profiles::queries::{
     get_profile_by_acct,
 };
 use crate::models::reactions::queries::{
-    create_reaction,
     get_reaction_by_activity_id,
     delete_reaction,
 };
@@ -42,6 +41,7 @@ use super::fetcher::helpers::{
 use super::handlers::{
     announce::handle_announce,
     delete::handle_delete,
+    like::handle_like,
     update_note::handle_update_note,
     update_person::handle_update_person,
 };
@@ -247,37 +247,7 @@ pub async fn receive_activity(
         },
         (EMOJI_REACT | LIKE, _) => {
             require_actor_signature(&activity.actor, &signer_id)?;
-            let author = get_or_import_profile_by_actor_id(
-                db_client,
-                &config.instance(),
-                &config.media_dir(),
-                &activity.actor,
-            ).await?;
-            let object_id = get_object_id(&activity.object)?;
-            let post_id = match parse_object_id(&config.instance_url(), &object_id) {
-                Ok(post_id) => post_id,
-                Err(_) => {
-                    let post = match get_post_by_object_id(db_client, &object_id).await {
-                        Ok(post) => post,
-                        // Ignore like if post is not found locally
-                        Err(DatabaseError::NotFound(_)) => return Ok(()),
-                        Err(other_error) => return Err(other_error.into()),
-                    };
-                    post.id
-                },
-            };
-            match create_reaction(
-                db_client,
-                &author.id,
-                &post_id,
-                Some(&activity.id),
-            ).await {
-                Ok(_) => (),
-                // Ignore activity if reaction is already saved
-                Err(DatabaseError::AlreadyExists(_)) => return Ok(()),
-                Err(other_error) => return Err(other_error.into()),
-            };
-            Some(NOTE)
+            handle_like(config, db_client, activity).await?
         },
         (FOLLOW, _) => {
             require_actor_signature(&activity.actor, &signer_id)?;