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

Check actor host before importing profile during search

Browse source
This commit is contained in:
silverpill 2021-11-18 13:19:18 +00:00
parent a6f2f2f4f1
commit 286e7155b8
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,15 @@ async fn search_profiles(
search_query: &str,
) -> Result<Vec<DbActorProfile>, HttpError> {
let (username, instance) = match parse_profile_query(search_query) {
Ok(parsed) => parsed,
Ok((username, mut instance)) => {
if let Some(ref actor_host) = instance {
if actor_host == &config.instance().host() {
// This is a local profile
instance = None;
};
};
(username, instance)
},
Err(_) => {
// Not an 'acct' query
return Ok(vec![]);
@ -40,9 +48,10 @@ async fn search_profiles(
};
let mut profiles = search_profile(db_client, &username, instance.as_ref()).await?;
if profiles.is_empty() && instance.is_some() {
let instance_host = instance.unwrap();
let actor_host = instance.unwrap();
let media_dir = config.media_dir();
match fetch_profile(&username, &instance_host, &media_dir).await {
// TODO: return error when trying to fetch local profile
match fetch_profile(&username, &actor_host, &media_dir).await {
Ok(profile_data) => {
let profile = create_profile(db_client, &profile_data).await?;
log::info!(