Make functions work with both connection and pool (#3420)

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

diff --git a/crates/routes/src/webfinger.rs b/crates/routes/src/webfinger.rs
index 1cf54bac4b511ffeee7180e01ed82380240d1926..72adc95029bbe387af146cdb61e61c993245d743 100644 (file)
--- a/crates/routes/src/webfinger.rs
+++ b/crates/routes/src/webfinger.rs
@@ -1,11 +1,16 @@
+use activitypub_federation::{
+  config::Data,
+  fetch::webfinger::{extract_webfinger_name, Webfinger, WebfingerLink},
+};
 use actix_web::{web, web::Query, HttpResponse};
-use anyhow::Context;
-use lemmy_api_common::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_websocket::LemmyContext;
+use lemmy_api_common::context::LemmyContext;
+use lemmy_db_schema::{
+  source::{community::Community, person::Person},
+  traits::ApubActor,
+};
+use lemmy_utils::error::LemmyError;
 use serde::Deserialize;
+use std::collections::HashMap;
 use url::Url;
 
 #[derive(Deserialize)]
@@ -13,13 +18,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
@@ -30,59 +33,60 @@ pub fn config(cfg: &mut web::ServiceConfig, settings: &Settings) {
 /// https://radical.town/.well-known/webfinger?resource=acct:felix@radical.town
 async fn get_webfinger_response(
   info: Query<Params>,
-  context: web::Data<LemmyContext>,
+  context: Data<LemmyContext>,
 ) -> Result<HttpResponse, LemmyError> {
-  let name = context
-    .settings()
-    .webfinger_regex()
-    .captures(&info.resource)
-    .map(|c| c.get(1))
-    .flatten()
-    .context(location_info!())?
-    .as_str()
-    .to_string();
+  let name = extract_webfinger_name(&info.resource, &context)?;
 
   let name_ = name.clone();
-  let community_id: Option<Url> = blocking(context.pool(), move |conn| {
-    Community::read_from_name(conn, &name_)
-  })
-  .await?
-  .ok()
-  .map(|c| c.actor_id.into());
-  let user_id: Option<Url> = blocking(context.pool(), move |conn| {
-    Person::find_by_name(conn, &name)
-  })
-  .await?
-  .ok()
-  .map(|c| c.actor_id.into());
+  let user_id: Option<Url> = Person::read_from_name(&mut context.pool(), &name_, false)
+    .await
+    .ok()
+    .map(|c| c.actor_id.into());
+  let community_id: Option<Url> = Community::read_from_name(&mut context.pool(), &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(user_id, "Person"),
+    webfinger_link_for_actor(community_id, "Group"),
   ]
   .into_iter()
   .flatten()
   .collect();
 
-  let json = WebfingerResponse {
-    subject: info.resource.to_owned(),
+  let json = Webfinger {
+    subject: info.resource.clone(),
     links,
+    ..Default::default()
   };
 
   Ok(HttpResponse::Ok().json(json))
 }
 
-fn webfinger_link_for_actor(url: Option<Url>) -> Vec<WebfingerLink> {
+fn webfinger_link_for_actor(url: Option<Url>, kind: &str) -> Vec<WebfingerLink> {
   if let Some(url) = url {
+    let mut properties = HashMap::new();
+    properties.insert(
+      "https://www.w3.org/ns/activitystreams#type"
+        .parse()
+        .expect("parse url"),
+      kind.to_string(),
+    );
     vec![
       WebfingerLink {
         rel: Some("http://webfinger.net/rel/profile-page".to_string()),
-        type_: Some("text/html".to_string()),
-        href: Some(url.to_owned()),
+        kind: Some("text/html".to_string()),
+        href: Some(url.clone()),
+        ..Default::default()
       },
       WebfingerLink {
         rel: Some("self".to_string()),
-        type_: Some("application/activity+json".to_string()),
+        kind: Some("application/activity+json".to_string()),
         href: Some(url),
+        properties,
       },
     ]
   } else {