+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::LemmyContext;
-use lemmy_apub::fetcher::webfinger::{WebfingerLink, WebfingerResponse};
+use lemmy_api_common::context::LemmyContext;
use lemmy_db_schema::{
source::{community::Community, person::Person},
traits::ApubActor,
};
-use lemmy_utils::{error::LemmyError, location_info};
+use lemmy_utils::error::LemmyError;
use serde::Deserialize;
+use std::collections::HashMap;
use url::Url;
#[derive(Deserialize)]
/// 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)
- .and_then(|c| c.get(1))
- .context(location_info!())?
- .as_str()
- .to_string();
+ let name = extract_webfinger_name(&info.resource, &context)?;
let name_ = name.clone();
- let user_id: Option<Url> = Person::read_from_name(context.pool(), &name_, false)
+ 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(context.pool(), &name, false)
+ 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(user_id),
- webfinger_link_for_actor(community_id),
+ webfinger_link_for_actor(user_id, "Person"),
+ webfinger_link_for_actor(community_id, "Group"),
]
.into_iter()
.flatten()
.collect();
- let json = WebfingerResponse {
+ 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()),
kind: Some("text/html".to_string()),
href: Some(url.clone()),
+ ..Default::default()
},
WebfingerLink {
rel: Some("self".to_string()),
kind: Some("application/activity+json".to_string()),
href: Some(url),
+ properties,
},
]
} else {