diff options
author | Dessalines <tyhou13@gmx.com> | 2020-07-13 11:57:39 -0400 |
---|---|---|
committer | Dessalines <tyhou13@gmx.com> | 2020-07-13 11:57:39 -0400 |
commit | ac56b57faa88b436991525b2455e5b655a7051b8 (patch) | |
tree | 2ef73d1e4839de423d42842c6f0dbb5e961f0bc9 /server/src/apub/private_message.rs | |
parent | e5d3e3a9c3e3257aaa5b1febd2893aa169c6c818 (diff) | |
parent | bb3e29e5c4abf1a5b572899fe2d2da4a4f865f2e (diff) |
Merge branch 'fix-migrate-apub-lib'
Diffstat (limited to 'server/src/apub/private_message.rs')
-rw-r--r-- | server/src/apub/private_message.rs | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/server/src/apub/private_message.rs b/server/src/apub/private_message.rs index 567a6178..228cc684 100644 --- a/server/src/apub/private_message.rs +++ b/server/src/apub/private_message.rs @@ -1,16 +1,9 @@ use crate::{ apub::{ - activities::send_activity, - create_tombstone, - fetcher::get_or_fetch_and_upsert_remote_user, - insert_activity, - ApubObjectType, - FromApub, - ToApub, + activities::send_activity, create_tombstone, fetcher::get_or_fetch_and_upsert_remote_user, + insert_activity, ApubObjectType, FromApub, ToApub, }, - blocking, - DbPool, - LemmyError, + blocking, DbPool, LemmyError, }; use activitystreams::{ activity::{Create, Delete, Undo, Update}, @@ -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> { |