summaryrefslogtreecommitdiffstats
path: root/server/src/apub/private_message.rs
diff options
context:
space:
mode:
authornutomic <nutomic@noreply.yerbamate.dev>2020-07-10 18:15:41 +0000
committerdessalines <dessalines@noreply.yerbamate.dev>2020-07-10 18:15:41 +0000
commit80aef61aed29d25099835ee4769bb8e1e363eb47 (patch)
tree8c83a360256c615db2ab749aeb29d73ae30895a0 /server/src/apub/private_message.rs
parentdebbd316c271f8867917a9eb8c4caa5c26093d66 (diff)
Split code into cargo workspaces (#67)
More fixes - fixed docker builds - fixed mentions regex test - fixed DATABASE_URL stuff - change schema path in diesel.toml Address review comments - add jsonb column back into activity table - remove authors field from cargo.toml - adjust LEMMY_DATABASE_URL env var usage - rename all occurences of LEMMY_DATABASE_URL to DATABASE_URL Decouple utils and db Split code into cargo workspaces Co-authored-by: Felix Ableitner <me@nutomic.com> Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/67
Diffstat (limited to 'server/src/apub/private_message.rs')
-rw-r--r--server/src/apub/private_message.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/server/src/apub/private_message.rs b/server/src/apub/private_message.rs
index 48bbd1f0..567a6178 100644
--- a/server/src/apub/private_message.rs
+++ b/server/src/apub/private_message.rs
@@ -3,18 +3,12 @@ use crate::{
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,
};
@@ -25,6 +19,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 {