From: Dessalines <tyhou13@gmx.com>
Date: Tue, 28 Apr 2020 14:10:05 +0000 (-0400)
Subject: Merge branch 'federation' into add_activity_table
X-Git-Url: http://these/git/%7B%60%24%7BarchiveTodayUrl%7D/%22%7Bauthor_url%7D/%22?a=commitdiff_plain;h=b60c7bbae7e605d43c93cb7b153d96982d97765b;p=lemmy.git

Merge branch 'federation' into add_activity_table
---

b60c7bbae7e605d43c93cb7b153d96982d97765b
diff --cc server/src/apub/mod.rs
index 77d42b82,373fa8da..6abe7ee7
--- a/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.