diff options
Diffstat (limited to 'server/src/apub/user_inbox.rs')
| -rw-r--r-- | server/src/apub/user_inbox.rs | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/server/src/apub/user_inbox.rs b/server/src/apub/user_inbox.rs index c63178e7..226235e6 100644 --- a/server/src/apub/user_inbox.rs +++ b/server/src/apub/user_inbox.rs @@ -3,19 +3,10 @@ use crate::{ apub::{ extensions::signatures::verify, fetcher::{get_or_fetch_and_upsert_remote_community, get_or_fetch_and_upsert_remote_user}, + insert_activity, FromApub, }, blocking, - db::{ - activity::insert_activity, - community::{CommunityFollower, CommunityFollowerForm}, - private_message::{PrivateMessage, PrivateMessageForm}, - private_message_view::PrivateMessageView, - user::User_, - Crud, - Followable, - }, - naive_now, routes::{ChatServerParam, DbPoolParam}, websocket::{server::SendUserRoomMessage, UserOperation}, DbPool, @@ -26,6 +17,15 @@ use activitystreams::{ object::Note, }; use actix_web::{client::Client, web, HttpRequest, HttpResponse}; +use lemmy_db::{ + community::{CommunityFollower, CommunityFollowerForm}, + naive_now, + private_message::{PrivateMessage, PrivateMessageForm}, + private_message_view::PrivateMessageView, + user::User_, + Crud, + Followable, +}; use log::debug; use serde::Deserialize; use std::fmt::Debug; @@ -116,7 +116,7 @@ async fn receive_create_private_message( pool: &DbPool, chat_server: ChatServerParam, ) -> Result<HttpResponse, LemmyError> { - let note = create + let mut note = create .create_props .get_object_base_box() .to_owned() @@ -135,7 +135,7 @@ async fn receive_create_private_message( insert_activity(user.id, create, false, pool).await?; - let private_message = PrivateMessageForm::from_apub(¬e, client, pool).await?; + let private_message = PrivateMessageForm::from_apub(&mut note, client, pool).await?; let inserted_private_message = blocking(pool, move |conn| { PrivateMessage::create(conn, &private_message) @@ -168,7 +168,7 @@ async fn receive_update_private_message( pool: &DbPool, chat_server: ChatServerParam, ) -> Result<HttpResponse, LemmyError> { - let note = update + let mut note = update .update_props .get_object_base_box() .to_owned() @@ -187,7 +187,7 @@ async fn receive_update_private_message( insert_activity(user.id, update, false, pool).await?; - let private_message_form = PrivateMessageForm::from_apub(¬e, client, pool).await?; + let private_message_form = PrivateMessageForm::from_apub(&mut note, client, pool).await?; let private_message_ap_id = private_message_form.ap_id.clone(); let private_message = blocking(pool, move |conn| { @@ -228,7 +228,7 @@ async fn receive_delete_private_message( pool: &DbPool, chat_server: ChatServerParam, ) -> Result<HttpResponse, LemmyError> { - let note = delete + let mut note = delete .delete_props .get_object_base_box() .to_owned() @@ -247,7 +247,7 @@ async fn receive_delete_private_message( insert_activity(user.id, delete, false, pool).await?; - let private_message_form = PrivateMessageForm::from_apub(¬e, client, pool).await?; + let private_message_form = PrivateMessageForm::from_apub(&mut note, client, pool).await?; let private_message_ap_id = private_message_form.ap_id; let private_message = blocking(pool, move |conn| { @@ -308,7 +308,7 @@ async fn receive_undo_delete_private_message( .to_owned() .into_concrete::<Delete>()?; - let note = delete + let mut note = delete .delete_props .get_object_base_box() .to_owned() @@ -327,7 +327,7 @@ async fn receive_undo_delete_private_message( insert_activity(user.id, delete, false, pool).await?; - let private_message = PrivateMessageForm::from_apub(¬e, client, pool).await?; + let private_message = PrivateMessageForm::from_apub(&mut note, client, pool).await?; let private_message_ap_id = private_message.ap_id.clone(); let private_message_id = blocking(pool, move |conn| { |