Remove federation option from master. (#745)

diff --git a/docker/lemmy.hjson b/docker/lemmy.hjson
index 8fe9bf554cb3b7374a3903abfe746d4a75ba5ae5..271fc78d8aee188020cd83cfb457f5ebfa2e3658 100644 (file)
--- a/docker/lemmy.hjson
+++ b/docker/lemmy.hjson
@@ -23,9 +23,6 @@
   jwt_secret: "changeme"
   # The dir for the front end
   front_end_dir: "/app/dist"
-  # whether to enable activitypub federation. this feature is in alpha, do not enable in production, as might
-  # cause problems like remote instances fetching and permanently storing bad data.
-  federation_enabled: false
   # rate limits for various user actions, by user ip
   rate_limit: {
     # maximum number of messages created in interval

diff --git a/server/src/routes/nodeinfo.rs b/server/src/routes/nodeinfo.rs
index 9ade80283a6c8f654643e602a4d1956ca8629a65..af6fc28227056b1173dd848f530329a8b76dc3f3 100644 (file)
--- a/server/src/routes/nodeinfo.rs
+++ b/server/src/routes/nodeinfo.rs
@@ -25,11 +25,7 @@ async fn node_info(
       Ok(site_view) => site_view,
       Err(_) => return Err(format_err!("not_found")),
     };
-    let protocols = if Settings::get().federation_enabled {
-      vec!["activitypub".to_string()]
-    } else {
-      vec![]
-    };
+    let protocols = vec![];
     Ok(NodeInfo {
       version: "2.0".to_string(),
       software: NodeInfoSoftware {

diff --git a/server/src/routes/webfinger.rs b/server/src/routes/webfinger.rs
index eaab1cb8cff3a0e5b2743184993b932964c840e5..18a21efa1203dd2c1a21df6ca483f916cd55f193 100644 (file)
--- a/server/src/routes/webfinger.rs
+++ b/server/src/routes/webfinger.rs
@@ -7,12 +7,10 @@ pub struct Params {
 }
 
 pub fn config(cfg: &mut web::ServiceConfig) {
-  if Settings::get().federation_enabled {
-    cfg.route(
-      ".well-known/webfinger",
-      web::get().to(get_webfinger_response),
-    );
-  }
+  cfg.route(
+    ".well-known/webfinger",
+    web::get().to(get_webfinger_response),
+  );
 }
 
 lazy_static! {

diff --git a/server/src/settings.rs b/server/src/settings.rs
index 6e5667cb2ee7fbc56a9a8394c3aedae18f07efa9..9d58d5b5d8ecce52e757f536b212db383570bc68 100644 (file)
--- a/server/src/settings.rs
+++ b/server/src/settings.rs
@@ -20,7 +20,6 @@ pub struct Settings {
   pub front_end_dir: String,
   pub rate_limit: RateLimitConfig,
   pub email: Option<EmailConfig>,
-  pub federation_enabled: bool,
 }
 
 #[derive(Debug, Deserialize, Clone)]