diff options
Diffstat (limited to 'server/src/apub/user_inbox.rs')
| -rw-r--r-- | server/src/apub/user_inbox.rs | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/server/src/apub/user_inbox.rs b/server/src/apub/user_inbox.rs index 226235e6..2bf26957 100644 --- a/server/src/apub/user_inbox.rs +++ b/server/src/apub/user_inbox.rs @@ -3,14 +3,12 @@ use crate::{ apub::{ extensions::signatures::verify, fetcher::{get_or_fetch_and_upsert_remote_community, get_or_fetch_and_upsert_remote_user}, - insert_activity, - FromApub, + insert_activity, FromApub, }, blocking, routes::{ChatServerParam, DbPoolParam}, websocket::{server::SendUserRoomMessage, UserOperation}, - DbPool, - LemmyError, + DbPool, LemmyError, }; use activitystreams::{ activity::{Accept, Create, Delete, Undo, Update}, @@ -23,8 +21,7 @@ use lemmy_db::{ private_message::{PrivateMessage, PrivateMessageForm}, private_message_view::PrivateMessageView, user::User_, - Crud, - Followable, + Crud, Followable, }; use log::debug; use serde::Deserialize; @@ -116,7 +113,7 @@ async fn receive_create_private_message( pool: &DbPool, chat_server: ChatServerParam, ) -> Result<HttpResponse, LemmyError> { - let mut note = create + let note = create .create_props .get_object_base_box() .to_owned() @@ -135,7 +132,7 @@ async fn receive_create_private_message( insert_activity(user.id, create, false, pool).await?; - let private_message = PrivateMessageForm::from_apub(&mut note, client, pool).await?; + let private_message = PrivateMessageForm::from_apub(¬e, client, pool).await?; let inserted_private_message = blocking(pool, move |conn| { PrivateMessage::create(conn, &private_message) @@ -168,7 +165,7 @@ async fn receive_update_private_message( pool: &DbPool, chat_server: ChatServerParam, ) -> Result<HttpResponse, LemmyError> { - let mut note = update + let note = update .update_props .get_object_base_box() .to_owned() @@ -187,7 +184,7 @@ async fn receive_update_private_message( insert_activity(user.id, update, false, pool).await?; - let private_message_form = PrivateMessageForm::from_apub(&mut note, client, pool).await?; + let private_message_form = PrivateMessageForm::from_apub(¬e, client, pool).await?; let private_message_ap_id = private_message_form.ap_id.clone(); let private_message = blocking(pool, move |conn| { @@ -228,7 +225,7 @@ async fn receive_delete_private_message( pool: &DbPool, chat_server: ChatServerParam, ) -> Result<HttpResponse, LemmyError> { - let mut note = delete + let note = delete .delete_props .get_object_base_box() .to_owned() @@ -247,7 +244,7 @@ async fn receive_delete_private_message( insert_activity(user.id, delete, false, pool).await?; - let private_message_form = PrivateMessageForm::from_apub(&mut note, client, pool).await?; + let private_message_form = PrivateMessageForm::from_apub(¬e, client, pool).await?; let private_message_ap_id = private_message_form.ap_id; let private_message = blocking(pool, move |conn| { @@ -308,7 +305,7 @@ async fn receive_undo_delete_private_message( .to_owned() .into_concrete::<Delete>()?; - let mut note = delete + let note = delete .delete_props .get_object_base_box() .to_owned() @@ -327,7 +324,7 @@ async fn receive_undo_delete_private_message( insert_activity(user.id, delete, false, pool).await?; - let private_message = PrivateMessageForm::from_apub(&mut note, client, pool).await?; + let private_message = PrivateMessageForm::from_apub(¬e, client, pool).await?; let private_message_ap_id = private_message.ap_id.clone(); let private_message_id = blocking(pool, move |conn| { |