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

Propagate database errors returned by importer in search_profiles_or_import()

Browse source
This commit is contained in:
silverpill 2023-01-11 18:37:39 +00:00
parent 7247441693
commit 22cf00fd98
2 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/activitypub/mod.rs
View file

@ -12,3 +12,5 @@ pub mod queues;
mod receiver;
pub mod views;
mod vocabulary;
pub use receiver::HandlerError;

44
src/mastodon_api/search/helpers.rs
View file

@ -11,6 +11,7 @@ use crate::activitypub::{
import_profile_by_actor_address,
},
identifiers::{parse_local_actor_id, parse_local_object_id},
HandlerError,
};
use crate::config::Config;
use crate::database::DatabaseError;
@ -117,25 +118,32 @@ async fn search_profiles_or_import(
maybe_hostname.as_ref(),
limit,
).await?;
if profiles.is_empty() && maybe_hostname.is_some() {
let actor_address = ActorAddress {
username: username,
hostname: maybe_hostname.unwrap(),
if profiles.is_empty() {
if let Some(hostname) = maybe_hostname {
let actor_address = ActorAddress { username, hostname };
match import_profile_by_actor_address(
db_client,
&config.instance(),
&config.media_dir(),
&actor_address,
).await {
Ok(profile) => {
profiles.push(profile);
},
Err(HandlerError::DatabaseError(db_error)) => {
// Propagate database errors
return Err(db_error);
},
Err(other_error) => {
log::warn!(
"failed to import profile {}: {}",
actor_address,
other_error,
);
},
};
};
match import_profile_by_actor_address(
db_client,
&config.instance(),
&config.media_dir(),
&actor_address,
).await {
Ok(profile) => {
profiles.push(profile);
},
Err(err) => {
log::warn!("{}", err);
},
}
}
};
Ok(profiles)
}