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 1cf54bac4b511ffeee7180e01ed82380240d1926..a13aad3ebeeb20077b30a3182d3382ad1a8f8669 100644 (file)
--- a/crates/routes/src/webfinger.rs
+++ b/crates/routes/src/webfinger.rs
@@ -1,9 +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};
-use lemmy_utils::{location_info, settings::structs::Settings, LemmyError};
+use lemmy_db_schema::{
+  source::{community::Community, person::Person},
+  traits::ApubActor,
+};
+use lemmy_utils::{error::LemmyError, location_info};
 use lemmy_websocket::LemmyContext;
 use serde::Deserialize;
 use url::Url;
@@ -13,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
@@ -36,28 +37,30 @@ async fn get_webfinger_response(
     .settings()
     .webfinger_regex()
     .captures(&info.resource)
-    .map(|c| c.get(1))
-    .flatten()
+    .and_then(|c| c.get(1))
     .context(location_info!())?
     .as_str()
     .to_string();
 
   let name_ = name.clone();
-  let community_id: Option<Url> = blocking(context.pool(), move |conn| {
-    Community::read_from_name(conn, &name_)
+  let user_id: Option<Url> = blocking(context.pool(), move |conn| {
+    Person::read_from_name(conn, &name_, false)
   })
   .await?
   .ok()
   .map(|c| c.actor_id.into());
-  let user_id: Option<Url> = blocking(context.pool(), move |conn| {
-    Person::find_by_name(conn, &name)
+  let community_id: Option<Url> = blocking(context.pool(), move |conn| {
+    Community::read_from_name(conn, &name, false)
   })
   .await?
   .ok()
   .map(|c| c.actor_id.into());
+
+  // Mastodon seems to prioritize the last webfinger item in case of duplicates. Put
+  // community last so that it gets prioritized. For Lemmy the order doesnt matter.
   let links = vec![
-    webfinger_link_for_actor(community_id),
     webfinger_link_for_actor(user_id),
+    webfinger_link_for_actor(community_id),
   ]
   .into_iter()
   .flatten()
@@ -76,12 +79,12 @@ fn webfinger_link_for_actor(url: Option<Url>) -> Vec<WebfingerLink> {
     vec![
       WebfingerLink {
         rel: Some("http://webfinger.net/rel/profile-page".to_string()),
-        type_: Some("text/html".to_string()),
+        kind: Some("text/html".to_string()),
         href: Some(url.to_owned()),
       },
       WebfingerLink {
         rel: Some("self".to_string()),
-        type_: Some("application/activity+json".to_string()),
+        kind: Some("application/activity+json".to_string()),
         href: Some(url),
       },
     ]