From a00b704cf4b89a109467234b349656ebbef48414 Mon Sep 17 00:00:00 2001 From: silverpill Date: Sat, 23 Jul 2022 21:37:21 +0000 Subject: [PATCH] Rename actor module to actors::types --- src/activitypub/actors/mod.rs | 1 + src/activitypub/{actor.rs => actors/types.rs} | 8 +++++--- src/activitypub/builders/accept_follow.rs | 2 +- src/activitypub/builders/add_person.rs | 2 +- src/activitypub/builders/announce_note.rs | 4 ++-- src/activitypub/builders/create_note.rs | 2 +- src/activitypub/builders/delete_person.rs | 2 +- src/activitypub/builders/follow.rs | 2 +- src/activitypub/builders/like_note.rs | 2 +- src/activitypub/builders/remove_person.rs | 2 +- src/activitypub/builders/undo_follow.rs | 2 +- src/activitypub/builders/update_person.rs | 2 +- src/activitypub/deliverer.rs | 2 +- src/activitypub/fetcher/fetchers.rs | 2 +- src/activitypub/fetcher/helpers.rs | 2 +- src/activitypub/handlers/create_note.rs | 2 +- src/activitypub/handlers/update_person.rs | 2 +- src/activitypub/mod.rs | 2 +- src/activitypub/views.rs | 2 +- src/mastodon_api/search/helpers.rs | 2 +- src/models/posts/mentions.rs | 4 ++-- src/models/profiles/queries.rs | 2 +- src/models/profiles/types.rs | 4 ++-- src/models/relationships/queries.rs | 2 +- 24 files changed, 31 insertions(+), 28 deletions(-) create mode 100644 src/activitypub/actors/mod.rs rename src/activitypub/{actor.rs => actors/types.rs} (98%) diff --git a/src/activitypub/actors/mod.rs b/src/activitypub/actors/mod.rs new file mode 100644 index 0000000..cd40856 --- /dev/null +++ b/src/activitypub/actors/mod.rs @@ -0,0 +1 @@ +pub mod types; diff --git a/src/activitypub/actor.rs b/src/activitypub/actors/types.rs similarity index 98% rename from src/activitypub/actor.rs rename to src/activitypub/actors/types.rs index f3cf8a0..2059d87 100644 --- a/src/activitypub/actor.rs +++ b/src/activitypub/actors/types.rs @@ -1,6 +1,11 @@ use serde::{Deserialize, Serialize}; use serde_json::{json, Value}; +use crate::activitypub::{ + constants::{ACTOR_KEY_SUFFIX, AP_CONTEXT}, + identifiers::{local_actor_id, LocalActorCollection}, + vocabulary::{IDENTITY_PROOF, IMAGE, PERSON, PROPERTY_VALUE, SERVICE}, +}; use crate::config::Instance; use crate::errors::ValidationError; use crate::ethereum::identity::{ @@ -12,9 +17,6 @@ use crate::models::profiles::types::{ExtraField, IdentityProof}; use crate::models::users::types::User; use crate::utils::crypto::{deserialize_private_key, get_public_key_pem}; use crate::utils::files::get_file_url; -use super::constants::{ACTOR_KEY_SUFFIX, AP_CONTEXT}; -use super::identifiers::{local_actor_id, LocalActorCollection}; -use super::vocabulary::{IDENTITY_PROOF, IMAGE, PERSON, PROPERTY_VALUE, SERVICE}; const W3ID_CONTEXT: &str = "https://w3id.org/security/v1"; diff --git a/src/activitypub/builders/accept_follow.rs b/src/activitypub/builders/accept_follow.rs index 9acaea8..1c03078 100644 --- a/src/activitypub/builders/accept_follow.rs +++ b/src/activitypub/builders/accept_follow.rs @@ -2,7 +2,7 @@ use serde_json::json; use crate::activitypub::{ activity::{create_activity, Activity, Object}, - actor::Actor, + actors::types::Actor, constants::AP_CONTEXT, deliverer::OutgoingActivity, identifiers::local_object_id, diff --git a/src/activitypub/builders/add_person.rs b/src/activitypub/builders/add_person.rs index 6136abe..bbe5a04 100644 --- a/src/activitypub/builders/add_person.rs +++ b/src/activitypub/builders/add_person.rs @@ -1,7 +1,7 @@ use serde::Serialize; use crate::activitypub::{ - actor::Actor, + actors::types::Actor, constants::AP_CONTEXT, deliverer::OutgoingActivity, identifiers::{local_actor_id, local_object_id, LocalActorCollection}, diff --git a/src/activitypub/builders/announce_note.rs b/src/activitypub/builders/announce_note.rs index aa972ab..3686bd6 100644 --- a/src/activitypub/builders/announce_note.rs +++ b/src/activitypub/builders/announce_note.rs @@ -3,7 +3,7 @@ use uuid::Uuid; use crate::activitypub::{ activity::{create_activity, Activity}, - actor::Actor, + actors::types::Actor, constants::AP_PUBLIC, deliverer::OutgoingActivity, identifiers::{local_actor_followers, local_object_id}, @@ -89,7 +89,7 @@ pub async fn prepare_announce_note( #[cfg(test)] mod tests { use serde_json::json; - use crate::activitypub::actor::Actor; + use crate::activitypub::actors::types::Actor; use crate::utils::id::new_uuid; use super::*; diff --git a/src/activitypub/builders/create_note.rs b/src/activitypub/builders/create_note.rs index 28ec2db..46567c9 100644 --- a/src/activitypub/builders/create_note.rs +++ b/src/activitypub/builders/create_note.rs @@ -4,7 +4,7 @@ use tokio_postgres::GenericClient; use crate::activitypub::{ activity::{create_activity, Activity, Attachment, Tag}, - actor::Actor, + actors::types::Actor, constants::{AP_CONTEXT, AP_PUBLIC}, deliverer::OutgoingActivity, identifiers::{ diff --git a/src/activitypub/builders/delete_person.rs b/src/activitypub/builders/delete_person.rs index 781c77a..1959425 100644 --- a/src/activitypub/builders/delete_person.rs +++ b/src/activitypub/builders/delete_person.rs @@ -3,7 +3,7 @@ use uuid::Uuid; use crate::activitypub::{ activity::{create_activity, Activity}, - actor::Actor, + actors::types::Actor, constants::AP_PUBLIC, deliverer::OutgoingActivity, vocabulary::DELETE, diff --git a/src/activitypub/builders/follow.rs b/src/activitypub/builders/follow.rs index 76a9b9b..31abca5 100644 --- a/src/activitypub/builders/follow.rs +++ b/src/activitypub/builders/follow.rs @@ -3,7 +3,7 @@ use uuid::Uuid; use crate::activitypub::{ activity::{create_activity, Activity, Object}, - actor::Actor, + actors::types::Actor, constants::AP_CONTEXT, deliverer::OutgoingActivity, identifiers::local_object_id, diff --git a/src/activitypub/builders/like_note.rs b/src/activitypub/builders/like_note.rs index 5d3ea84..552e996 100644 --- a/src/activitypub/builders/like_note.rs +++ b/src/activitypub/builders/like_note.rs @@ -3,7 +3,7 @@ use uuid::Uuid; use crate::activitypub::{ activity::{create_activity, Activity}, - actor::Actor, + actors::types::Actor, constants::AP_PUBLIC, deliverer::OutgoingActivity, identifiers::local_object_id, diff --git a/src/activitypub/builders/remove_person.rs b/src/activitypub/builders/remove_person.rs index 048adb7..e0caf25 100644 --- a/src/activitypub/builders/remove_person.rs +++ b/src/activitypub/builders/remove_person.rs @@ -1,5 +1,5 @@ use crate::activitypub::{ - actor::Actor, + actors::types::Actor, deliverer::OutgoingActivity, identifiers::LocalActorCollection, }; diff --git a/src/activitypub/builders/undo_follow.rs b/src/activitypub/builders/undo_follow.rs index f3948b2..cce7a14 100644 --- a/src/activitypub/builders/undo_follow.rs +++ b/src/activitypub/builders/undo_follow.rs @@ -3,7 +3,7 @@ use uuid::Uuid; use crate::activitypub::{ activity::{create_activity, Activity, Object}, - actor::Actor, + actors::types::Actor, constants::AP_CONTEXT, deliverer::OutgoingActivity, identifiers::{local_actor_id, local_object_id}, diff --git a/src/activitypub/builders/update_person.rs b/src/activitypub/builders/update_person.rs index 1832aa9..f44a35f 100644 --- a/src/activitypub/builders/update_person.rs +++ b/src/activitypub/builders/update_person.rs @@ -3,7 +3,7 @@ use uuid::Uuid; use crate::activitypub::{ activity::{create_activity, Activity}, - actor::{get_local_actor, Actor, ActorKeyError}, + actors::types::{get_local_actor, Actor, ActorKeyError}, constants::AP_PUBLIC, deliverer::OutgoingActivity, identifiers::{local_actor_followers, local_object_id}, diff --git a/src/activitypub/deliverer.rs b/src/activitypub/deliverer.rs index 761f2d1..4e24fbd 100644 --- a/src/activitypub/deliverer.rs +++ b/src/activitypub/deliverer.rs @@ -6,7 +6,7 @@ use crate::config::Instance; use crate::http_signatures::create::{create_http_signature, SignatureError}; use crate::models::users::types::User; use crate::utils::crypto::deserialize_private_key; -use super::actor::Actor; +use super::actors::types::Actor; use super::constants::{ACTIVITY_CONTENT_TYPE, ACTOR_KEY_SUFFIX}; use super::identifiers::local_actor_id; diff --git a/src/activitypub/fetcher/fetchers.rs b/src/activitypub/fetcher/fetchers.rs index e23176f..cee41b6 100644 --- a/src/activitypub/fetcher/fetchers.rs +++ b/src/activitypub/fetcher/fetchers.rs @@ -5,7 +5,7 @@ use reqwest::{Client, Method}; use serde_json::Value; use crate::activitypub::activity::Object; -use crate::activitypub::actor::{Actor, ActorAddress}; +use crate::activitypub::actors::types::{Actor, ActorAddress}; use crate::activitypub::constants::ACTIVITY_CONTENT_TYPE; use crate::config::Instance; use crate::http_signatures::create::{create_http_signature, SignatureError}; diff --git a/src/activitypub/fetcher/helpers.rs b/src/activitypub/fetcher/helpers.rs index b5035b9..4852979 100644 --- a/src/activitypub/fetcher/helpers.rs +++ b/src/activitypub/fetcher/helpers.rs @@ -4,7 +4,7 @@ use std::path::Path; use tokio_postgres::GenericClient; use crate::activitypub::activity::Object; -use crate::activitypub::actor::{Actor, ActorAddress}; +use crate::activitypub::actors::types::{Actor, ActorAddress}; use crate::activitypub::handlers::{ create_note::handle_note, update_person::update_remote_profile, diff --git a/src/activitypub/handlers/create_note.rs b/src/activitypub/handlers/create_note.rs index 44df487..b5642be 100644 --- a/src/activitypub/handlers/create_note.rs +++ b/src/activitypub/handlers/create_note.rs @@ -303,7 +303,7 @@ pub async fn handle_note( #[cfg(test)] mod tests { use crate::activitypub::activity::Object; - use crate::activitypub::actor::Actor; + use crate::activitypub::actors::types::Actor; use crate::activitypub::vocabulary::NOTE; use super::*; diff --git a/src/activitypub/handlers/update_person.rs b/src/activitypub/handlers/update_person.rs index c6ac920..9b90128 100644 --- a/src/activitypub/handlers/update_person.rs +++ b/src/activitypub/handlers/update_person.rs @@ -4,7 +4,7 @@ use tokio_postgres::GenericClient; use crate::activitypub::{ activity::Activity, - actor::Actor, + actors::types::Actor, fetcher::fetchers::{fetch_actor_avatar, fetch_actor_banner}, fetcher::helpers::ImportError, vocabulary::PERSON, diff --git a/src/activitypub/mod.rs b/src/activitypub/mod.rs index 0e2b3f8..d474181 100644 --- a/src/activitypub/mod.rs +++ b/src/activitypub/mod.rs @@ -1,5 +1,5 @@ mod activity; -pub mod actor; +pub mod actors; pub mod builders; mod collections; pub mod constants; diff --git a/src/activitypub/views.rs b/src/activitypub/views.rs index 14c23e6..4d36616 100644 --- a/src/activitypub/views.rs +++ b/src/activitypub/views.rs @@ -15,8 +15,8 @@ use crate::errors::HttpError; use crate::frontend::{get_post_page_url, get_profile_page_url}; use crate::models::posts::queries::{get_posts_by_author, get_thread}; use crate::models::users::queries::get_user_by_name; +use super::actors::types::{get_local_actor, get_instance_actor}; use super::builders::create_note::{build_note, build_create_note}; -use super::actor::{get_local_actor, get_instance_actor}; use super::collections::{ COLLECTION_PAGE_SIZE, OrderedCollection, diff --git a/src/mastodon_api/search/helpers.rs b/src/mastodon_api/search/helpers.rs index c631a57..4e2a772 100644 --- a/src/mastodon_api/search/helpers.rs +++ b/src/mastodon_api/search/helpers.rs @@ -2,7 +2,7 @@ use regex::Regex; use tokio_postgres::GenericClient; use url::Url; -use crate::activitypub::actor::ActorAddress; +use crate::activitypub::actors::types::ActorAddress; use crate::activitypub::fetcher::helpers::{ import_post, import_profile_by_actor_address, diff --git a/src/models/posts/mentions.rs b/src/models/posts/mentions.rs index 50d7915..ddc6ecd 100644 --- a/src/models/posts/mentions.rs +++ b/src/models/posts/mentions.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use regex::{Captures, Regex}; use tokio_postgres::GenericClient; -use crate::activitypub::actor::ActorAddress; +use crate::activitypub::actors::types::ActorAddress; use crate::errors::{DatabaseError, ValidationError}; use crate::models::profiles::queries::get_profiles_by_accts; use crate::models::profiles::types::DbActorProfile; @@ -104,7 +104,7 @@ pub fn mention_to_address( #[cfg(test)] mod tests { - use crate::activitypub::actor::Actor; + use crate::activitypub::actors::types::Actor; use super::*; const INSTANCE_HOST: &str = "server1.com"; diff --git a/src/models/profiles/queries.rs b/src/models/profiles/queries.rs index d7c3d9d..681e7e2 100644 --- a/src/models/profiles/queries.rs +++ b/src/models/profiles/queries.rs @@ -488,7 +488,7 @@ pub async fn update_post_count( #[cfg(test)] mod tests { use serial_test::serial; - use crate::activitypub::actor::Actor; + use crate::activitypub::actors::types::Actor; use crate::database::test_utils::create_test_database; use crate::models::profiles::queries::create_profile; use crate::models::profiles::types::{ diff --git a/src/models/profiles/types.rs b/src/models/profiles/types.rs index 038efaa..6430717 100644 --- a/src/models/profiles/types.rs +++ b/src/models/profiles/types.rs @@ -3,7 +3,7 @@ use postgres_types::FromSql; use serde::{Deserialize, Serialize}; use uuid::Uuid; -use crate::activitypub::actor::Actor; +use crate::activitypub::actors::types::Actor; use crate::activitypub::identifiers::local_actor_id; use crate::database::json_macro::{json_from_sql, json_to_sql}; use crate::errors::ValidationError; @@ -228,7 +228,7 @@ impl From<&DbActorProfile> for ProfileUpdateData { #[cfg(test)] mod tests { - use crate::activitypub::actor::Actor; + use crate::activitypub::actors::types::Actor; use super::*; const INSTANCE_HOST: &str = "example.com"; diff --git a/src/models/relationships/queries.rs b/src/models/relationships/queries.rs index a09d084..53b74a2 100644 --- a/src/models/relationships/queries.rs +++ b/src/models/relationships/queries.rs @@ -453,7 +453,7 @@ pub async fn show_replies( #[cfg(test)] mod tests { use serial_test::serial; - use crate::activitypub::actor::Actor; + use crate::activitypub::actors::types::Actor; use crate::database::test_utils::create_test_database; use crate::errors::DatabaseError; use crate::models::profiles::queries::create_profile;