Merge branch 'federation' into add_activity_table

diff --cc server/src/apub/comment.rs
Simple merge

diff --cc server/src/apub/mod.rs
index 77d42b82e7fb9d4cf235070592832056e6229c3c,373fa8da0d249899e38426cccab403bbb6038de9..6abe7ee7159b869c618709a60642e91457ae31b4
--- 1/server/src/apub/mod.rs
--- 2/server/src/apub/mod.rs
+++ b/server/src/apub/mod.rs
@@@ -183,13 -178,13 +179,13 @@@ pub trait ActorType 
    // These two have default impls, since currently a community can't follow anything,
    // and a user can't be followed (yet)
    #[allow(unused_variables)]
 -  fn send_follow(&self, follow_actor_id: &str) -> Result<(), Error> {
 +  fn send_follow(&self, follow_actor_id: &str, conn: &PgConnection) -> Result<(), Error> {
-     Ok(())
+     Err(format_err!("Follow not implemented."))
    }
  
    #[allow(unused_variables)]
 -  fn send_accept_follow(&self, follow: &Follow) -> Result<(), Error> {
 +  fn send_accept_follow(&self, follow: &Follow, conn: &PgConnection) -> Result<(), Error> {
-     Ok(())
+     Err(format_err!("Accept not implemented."))
    }
  
    // TODO default because there is no user following yet.

diff --cc server/src/apub/shared_inbox.rs
Simple merge