-use activitypub_federation::fetch::webfinger::{Webfinger, WebfingerLink};
+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::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;
/// 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());