diff options
Diffstat (limited to 'server/src/apub/private_message.rs')
-rw-r--r-- | server/src/apub/private_message.rs | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/server/src/apub/private_message.rs b/server/src/apub/private_message.rs index 48bbd1f0..228cc684 100644 --- a/server/src/apub/private_message.rs +++ b/server/src/apub/private_message.rs @@ -1,22 +1,9 @@ use crate::{ apub::{ - activities::send_activity, - create_tombstone, - fetcher::get_or_fetch_and_upsert_remote_user, - ApubObjectType, - FromApub, - ToApub, + activities::send_activity, create_tombstone, fetcher::get_or_fetch_and_upsert_remote_user, + insert_activity, ApubObjectType, FromApub, ToApub, }, - blocking, - convert_datetime, - db::{ - activity::insert_activity, - private_message::{PrivateMessage, PrivateMessageForm}, - user::User_, - Crud, - }, - DbPool, - LemmyError, + blocking, DbPool, LemmyError, }; use activitystreams::{ activity::{Create, Delete, Undo, Update}, @@ -25,6 +12,12 @@ use activitystreams::{ }; use activitystreams_new::object::Tombstone; use actix_web::client::Client; +use lemmy_db::{ + private_message::{PrivateMessage, PrivateMessageForm}, + user::User_, + Crud, +}; +use lemmy_utils::convert_datetime; #[async_trait::async_trait(?Send)] impl ToApub for PrivateMessage { @@ -71,7 +64,7 @@ impl FromApub for PrivateMessageForm { /// Parse an ActivityPub note received from another instance into a Lemmy Private message async fn from_apub( - note: &mut Note, + note: &Note, client: &Client, pool: &DbPool, ) -> Result<PrivateMessageForm, LemmyError> { |