grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Split methods in fetcher.rs for faster compilation (ref #1139)

Browse source
This commit is contained in:
Felix Ableitner 2020-11-23 14:36:24 +01:00
parent 911b26f163
commit 1b91f0f549
1 changed files with 29 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
lemmy_apub/src/fetcher.rs
View file

@ -136,6 +136,22 @@ pub async fn search_by_apub_id(
Url::parse(&query)? Url::parse(&query)?
}; };
let recursion_counter = &mut 0;
let search_result =
fetch_remote_object::<SearchAcceptedObjects>(context.client(), &query_url, recursion_counter)
.await?;
let response = match_search_result(context, search_result, query_url, recursion_counter).await?;
Ok(response)
}
async fn match_search_result(
context: &LemmyContext,
search_result: SearchAcceptedObjects,
query_url: Url,
recursion_counter: &mut i32,
) -> Result<SearchResponse, LemmyError> {
let domain = query_url.domain().context("url has no domain")?;
let mut response = SearchResponse { let mut response = SearchResponse {
type_: SearchType::All.to_string(), type_: SearchType::All.to_string(),
comments: vec![], comments: vec![],
@ -144,15 +160,7 @@ pub async fn search_by_apub_id(
users: vec![], users: vec![],
}; };
let domain = query_url.domain().context("url has no domain")?; match search_result {
let recursion_counter = &mut 0;
let response = match fetch_remote_object::<SearchAcceptedObjects>(
context.client(),
&query_url,
recursion_counter,
)
.await?
{
SearchAcceptedObjects::Person(p) => { SearchAcceptedObjects::Person(p) => {
let user_uri = p.inner.id(domain)?.context("person has no id")?; let user_uri = p.inner.id(domain)?.context("person has no id")?;
@ -164,8 +172,6 @@ pub async fn search_by_apub_id(
}) })
.await??, .await??,
]; ];
response
} }
SearchAcceptedObjects::Group(g) => { SearchAcceptedObjects::Group(g) => {
let community_uri = g.inner.id(domain)?.context("group has no id")?; let community_uri = g.inner.id(domain)?.context("group has no id")?;
@ -179,8 +185,6 @@ pub async fn search_by_apub_id(
}) })
.await??, .await??,
]; ];
response
} }
SearchAcceptedObjects::Page(p) => { SearchAcceptedObjects::Page(p) => {
let post_form = PostForm::from_apub(&p, context, Some(query_url), recursion_counter).await?; let post_form = PostForm::from_apub(&p, context, Some(query_url), recursion_counter).await?;
@ -188,8 +192,6 @@ pub async fn search_by_apub_id(
let p = blocking(context.pool(), move |conn| Post::upsert(conn, &post_form)).await??; let p = blocking(context.pool(), move |conn| Post::upsert(conn, &post_form)).await??;
response.posts = response.posts =
vec![blocking(context.pool(), move |conn| PostView::read(conn, p.id, None)).await??]; vec![blocking(context.pool(), move |conn| PostView::read(conn, p.id, None)).await??];
response
} }
SearchAcceptedObjects::Comment(c) => { SearchAcceptedObjects::Comment(c) => {
let comment_form = let comment_form =
@ -205,8 +207,6 @@ pub async fn search_by_apub_id(
}) })
.await??, .await??,
]; ];
response
} }
}; };
@ -391,7 +391,17 @@ async fn fetch_remote_community(
.await??; .await??;
} }
// fetch outbox (maybe make this conditional) // maybe make this conditional
fetch_community_outbox(context, &community, recursion_counter).await?;
Ok(community)
}
async fn fetch_community_outbox(
context: &LemmyContext,
community: &Community,
recursion_counter: &mut i32,
) -> Result<(), LemmyError> {
let outbox = fetch_remote_object::<OrderedCollection>( let outbox = fetch_remote_object::<OrderedCollection>(
context.client(), context.client(),
&community.get_outbox_url()?, &community.get_outbox_url()?,
@ -425,7 +435,7 @@ async fn fetch_remote_community(
// TODO: we need to send a websocket update here // TODO: we need to send a websocket update here
} }
Ok(community) Ok(())
} }
/// Gets a post by its apub ID. If it exists locally, it is returned directly. Otherwise it is /// Gets a post by its apub ID. If it exists locally, it is returned directly. Otherwise it is