From e756bbacf4c12fdf5740b63e2a9a0a3693d9f7c8 Mon Sep 17 00:00:00 2001
From: silverpill <silverpill@firemail.cc>
Date: Sun, 13 Feb 2022 18:55:37 +0000
Subject: [PATCH] Add tests for note visibility detection

---
 src/activitypub/inbox/create.rs | 60 +++++++++++++++++++++++++++++++++
 src/activitypub/inbox/mod.rs    |  1 +
 src/activitypub/mod.rs          |  1 +
 src/activitypub/receiver.rs     | 24 +++++--------
 4 files changed, 70 insertions(+), 16 deletions(-)
 create mode 100644 src/activitypub/inbox/create.rs
 create mode 100644 src/activitypub/inbox/mod.rs

diff --git a/src/activitypub/inbox/create.rs b/src/activitypub/inbox/create.rs
new file mode 100644
index 0000000..72fb386
--- /dev/null
+++ b/src/activitypub/inbox/create.rs
@@ -0,0 +1,60 @@
+use crate::activitypub::constants::AP_PUBLIC;
+use crate::models::posts::types::Visibility;
+use crate::models::profiles::types::DbActorProfile;
+
+pub fn get_note_visibility(
+    note_id: &str,
+    author: &DbActorProfile,
+    primary_audience: Vec<String>,
+    secondary_audience: Vec<String>,
+) -> Visibility {
+    if primary_audience.contains(&AP_PUBLIC.to_string()) ||
+            secondary_audience.contains(&AP_PUBLIC.to_string()) {
+        Visibility::Public
+    } else {
+        // Treat all notes that aren't public-addressed as direct messages
+        log::warn!(
+            "processing non-public note {} attributed to {}; primary audience {:?}; secondary audience {:?}",
+            note_id,
+            author.username,
+            primary_audience,
+            secondary_audience,
+        );
+        Visibility::Direct
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_get_note_visibility_public() {
+        let object_id = "https://example.com/test";
+        let author = DbActorProfile::default();
+        let primary_audience = vec![AP_PUBLIC.to_string()];
+        let secondary_audience = vec![];
+        let visibility = get_note_visibility(
+            object_id,
+            &author,
+            primary_audience,
+            secondary_audience,
+        );
+        assert_eq!(visibility, Visibility::Public);
+    }
+
+    #[test]
+    fn test_get_note_visibility_direct() {
+        let object_id = "https://example.com/test";
+        let author = DbActorProfile::default();
+        let primary_audience = vec!["https://example.com/users/1".to_string()];
+        let secondary_audience = vec![];
+        let visibility = get_note_visibility(
+            object_id,
+            &author,
+            primary_audience,
+            secondary_audience,
+        );
+        assert_eq!(visibility, Visibility::Direct);
+    }
+}
diff --git a/src/activitypub/inbox/mod.rs b/src/activitypub/inbox/mod.rs
new file mode 100644
index 0000000..c5fb369
--- /dev/null
+++ b/src/activitypub/inbox/mod.rs
@@ -0,0 +1 @@
+pub mod create;
diff --git a/src/activitypub/mod.rs b/src/activitypub/mod.rs
index d45f633..4b2442d 100644
--- a/src/activitypub/mod.rs
+++ b/src/activitypub/mod.rs
@@ -4,6 +4,7 @@ mod collections;
 pub mod constants;
 pub mod deliverer;
 pub mod fetcher;
+mod inbox;
 pub mod receiver;
 pub mod views;
 mod vocabulary;
diff --git a/src/activitypub/receiver.rs b/src/activitypub/receiver.rs
index 1100374..0331e32 100644
--- a/src/activitypub/receiver.rs
+++ b/src/activitypub/receiver.rs
@@ -17,7 +17,7 @@ use crate::models::posts::queries::{
     delete_post,
 };
 use crate::models::posts::tags::normalize_tag;
-use crate::models::posts::types::{Post, PostCreateData, Visibility};
+use crate::models::posts::types::{Post, PostCreateData};
 use crate::models::profiles::queries::{
     get_profile_by_actor_id,
     get_profile_by_acct,
@@ -40,7 +40,6 @@ use crate::models::users::queries::get_user_by_name;
 use crate::utils::html::clean_html;
 use super::activity::{Object, Activity, create_activity_accept_follow};
 use super::actor::Actor;
-use super::constants::AP_PUBLIC;
 use super::deliverer::deliver_activity;
 use super::fetcher::fetchers::{
     fetch_avatar_and_banner,
@@ -52,6 +51,7 @@ use super::fetcher::helpers::{
     import_profile_by_actor_address,
     ImportError,
 };
+use super::inbox::create::get_note_visibility;
 use super::vocabulary::*;
 
 fn parse_actor_id(
@@ -378,20 +378,12 @@ pub async fn process_note(
             },
             None => vec![],
         };
-        let visibility = if primary_audience.contains(&AP_PUBLIC.to_string()) ||
-                secondary_audience.contains(&AP_PUBLIC.to_string()) {
-            Visibility::Public
-        } else {
-            // Treat all notes that aren't public-addressed as direct messages
-            log::warn!(
-                "processing non-public note {} attributed to {}; primary audience {:?}; secondary audience {:?}",
-                object.id,
-                author_id,
-                primary_audience,
-                secondary_audience,
-            );
-            Visibility::Direct
-        };
+        let visibility = get_note_visibility(
+            &object.id,
+            &author,
+            primary_audience,
+            secondary_audience,
+        );
         let post_data = PostCreateData {
             content: content_cleaned,
             in_reply_to_id,