FediMovies/fedimovies
1
1
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Activity

Refactor profile importers

Browse source
This commit is contained in:
silverpill 2022-07-27 13:21:12 +00:00
parent bc1b73dd24
commit 67c6b76bcb
2 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/activitypub/actors/types.rs
View file

@ -115,10 +115,11 @@ impl Actor {
pub fn address(
&self,
this_instance_host: &str,
) -> Result<ActorAddress, url::ParseError> {
let actor_host = url::Url::parse(&self.id)?
) -> Result<ActorAddress, ValidationError> {
let actor_host = url::Url::parse(&self.id)
.map_err(|_| ValidationError("invalid actor ID"))?
.host_str()
.ok_or(url::ParseError::EmptyHost)?
.ok_or(ValidationError("invalid actor ID"))?
.to_owned();
let is_local = actor_host == this_instance_host;
let actor_address = ActorAddress {

44
src/activitypub/fetcher/helpers.rs
View file

@ -57,13 +57,13 @@ impl From<ImportError> for HttpError {
}
}
async fn prepare_remote_profile_data(
async fn create_remote_profile(
db_client: &impl GenericClient,
instance: &Instance,
media_dir: &Path,
actor: Actor,
) -> Result<ProfileCreateData, ImportError> {
let actor_address = actor.address(&instance.host())
.map_err(|_| ValidationError("invalid actor ID"))?;
) -> Result<DbActorProfile, ImportError> {
let actor_address = actor.address(&instance.host())?;
if actor_address.is_local {
return Err(ImportError::LocalObject);
};
@ -71,7 +71,7 @@ async fn prepare_remote_profile_data(
let banner = fetch_actor_banner(&actor, media_dir, None).await;
let (identity_proofs, payment_options, extra_fields) =
actor.parse_attachments();
let profile_data = ProfileCreateData {
let mut profile_data = ProfileCreateData {
username: actor.preferred_username.clone(),
display_name: actor.name.clone(),
acct: actor_address.acct(),
@ -83,7 +83,9 @@ async fn prepare_remote_profile_data(
extra_fields,
actor_json: Some(actor),
};
Ok(profile_data)
profile_data.clean()?;
let profile = create_profile(db_client, profile_data).await?;
Ok(profile)
}
pub async fn get_or_import_profile_by_actor_id(
@ -124,8 +126,7 @@ pub async fn get_or_import_profile_by_actor_id(
},
Err(DatabaseError::NotFound(_)) => {
let actor = fetch_actor(instance, actor_id).await?;
let actor_address = actor.address(&instance.host())
.map_err(|_| ValidationError("invalid actor ID"))?;
let actor_address = actor.address(&instance.host())?;
match get_profile_by_acct(db_client, &actor_address.acct()).await {
Ok(profile) => {
// WARNING: Possible actor ID change
@ -139,14 +140,13 @@ pub async fn get_or_import_profile_by_actor_id(
profile_updated
},
Err(DatabaseError::NotFound(_)) => {
let mut profile_data = prepare_remote_profile_data(
log::info!("fetched profile {}", actor_address.acct());
let profile = create_remote_profile(
db_client,
instance,
media_dir,
actor,
).await?;
log::info!("fetched profile {}", profile_data.acct);
profile_data.clean()?;
let profile = create_profile(db_client, profile_data).await?;
profile
},
Err(other_error) => return Err(other_error.into()),
@ -169,22 +169,22 @@ pub async fn import_profile_by_actor_address(
};
let actor_id = perform_webfinger_query(instance, actor_address).await?;
let actor = fetch_actor(instance, &actor_id).await?;
let mut profile_data = prepare_remote_profile_data(
instance,
media_dir,
actor,
).await?;
if profile_data.acct != actor_address.acct() {
let profile_acct = actor.address(&instance.host())?.acct();
if profile_acct != actor_address.acct() {
// Redirected to different server
match get_profile_by_acct(db_client, &profile_data.acct).await {
match get_profile_by_acct(db_client, &profile_acct).await {
Ok(profile) => return Ok(profile),
Err(DatabaseError::NotFound(_)) => (),
Err(other_error) => return Err(other_error.into()),
};
};
log::info!("fetched profile {}", profile_data.acct);
profile_data.clean()?;
let profile = create_profile(db_client, profile_data).await?;
log::info!("fetched profile {}", profile_acct);
let profile = create_remote_profile(
db_client,
instance,
media_dir,
actor,
).await?;
Ok(profile)
}