Merge branch 'federated_private_messages' into federation

diff --cc server/src/apub/mod.rs
index 8b4ceb79b58b33b0f5ec0be977ae65b935fbc54e,e955f7ed71b39ce0807959e08dde714ebaf7df94..77950d414aff8e34825aa4b571232a97da2a1c47
--- 1/server/src/apub/mod.rs
--- 2/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 bdfc1a0d14d169c07c26264c06a9a4ec4ba2f88a,c7f0e4b91fdaa3d6b3547922e472517444b166ef..b51996db239115b81de88680d4fdc242a34937f5
--- 1/server/src/db/code_migrations.rs
--- 2/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;