Moving settings to Database. (#2492)

[lemmy.git] / crates / routes / src / webfinger.rs

diff --git a/crates/routes/src/webfinger.rs b/crates/routes/src/webfinger.rs
index a95902b270baad0e7230f74517181c328a4105f5..a13aad3ebeeb20077b30a3182d3382ad1a8f8669 100644 (file)
--- a/crates/routes/src/webfinger.rs
+++ b/crates/routes/src/webfinger.rs
@@ -1,12 +1,12 @@
 use actix_web::{web, web::Query, HttpResponse};
 use anyhow::Context;
-use lemmy_api_common::blocking;
+use lemmy_api_common::utils::blocking;
 use lemmy_apub::fetcher::webfinger::{WebfingerLink, WebfingerResponse};
 use lemmy_db_schema::{
   source::{community::Community, person::Person},
   traits::ApubActor,
 };
-use lemmy_utils::{location_info, settings::structs::Settings, LemmyError};
+use lemmy_utils::{error::LemmyError, location_info};
 use lemmy_websocket::LemmyContext;
 use serde::Deserialize;
 use url::Url;
@@ -16,13 +16,11 @@ struct Params {
   resource: String,
 }
 
-pub fn config(cfg: &mut web::ServiceConfig, settings: &Settings) {
-  if settings.federation.enabled {
-    cfg.route(
-      ".well-known/webfinger",
-      web::get().to(get_webfinger_response),
-    );
-  }
+pub fn config(cfg: &mut web::ServiceConfig) {
+  cfg.route(
+    ".well-known/webfinger",
+    web::get().to(get_webfinger_response),
+  );
 }
 
 /// Responds to webfinger requests of the following format. There isn't any real documentation for
@@ -46,13 +44,13 @@ async fn get_webfinger_response(
 
   let name_ = name.clone();
   let user_id: Option<Url> = blocking(context.pool(), move |conn| {
-    Person::read_from_name(conn, &name_)
+    Person::read_from_name(conn, &name_, false)
   })
   .await?
   .ok()
   .map(|c| c.actor_id.into());
   let community_id: Option<Url> = blocking(context.pool(), move |conn| {
-    Community::read_from_name(conn, &name)
+    Community::read_from_name(conn, &name, false)
   })
   .await?
   .ok()