From: Dessalines <tyhou13@gmx.com>
Date: Wed, 6 May 2020 17:51:39 +0000 (-0400)
Subject: Merge branch 'federated_private_messages' into federation
X-Git-Url: http://these/git/%7B%60https:/%22https:/hacktivis.me/static/git-favicon.png?a=commitdiff_plain;h=66142c546b4a7120b94bacc18cf478ae1905fd46;p=lemmy.git

Merge branch 'federated_private_messages' into federation
---

66142c546b4a7120b94bacc18cf478ae1905fd46
diff --cc server/src/apub/mod.rs
index 8b4ceb79,e955f7ed..77950d41
--- a/server/src/apub/mod.rs
+++ b/server/src/apub/mod.rs
@@@ -2,10 -2,12 +2,11 @@@ pub mod activities
  pub mod comment;
  pub mod community;
  pub mod community_inbox;
 +pub mod extensions;
  pub mod fetcher;
 -pub mod page_extension;
  pub mod post;
+ pub mod private_message;
  pub mod shared_inbox;
 -pub mod signatures;
  pub mod user;
  pub mod user_inbox;
  
diff --cc server/src/db/code_migrations.rs
index bdfc1a0d,c7f0e4b9..b51996db
--- a/server/src/db/code_migrations.rs
+++ b/server/src/db/code_migrations.rs
@@@ -2,9 -2,10 +2,10 @@@
  use super::comment::Comment;
  use super::community::{Community, CommunityForm};
  use super::post::Post;
+ use super::private_message::PrivateMessage;
  use super::user::{UserForm, User_};
  use super::*;
 -use crate::apub::signatures::generate_actor_keypair;
 +use crate::apub::extensions::signatures::generate_actor_keypair;
  use crate::apub::{make_apub_endpoint, EndpointType};
  use crate::naive_now;
  use failure::Error;