alemi/upub
alemi/upub
1
0
Fork 1
Code Issues 4 Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: iter nodes not inner vals, remove logs

Browse source
This commit is contained in:
əlemi 2024-11-11 00:29:08 +01:00
parent bdb7152179
commit 63e1e1f440
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
upub/core/src/traits/fetch.rs
View file

@ -402,19 +402,14 @@ impl Fetcher for crate::Context {
} }
async fn fetch_thread(&self, id: &str, tx: &impl ConnectionTrait) -> Result<(), RequestError> { async fn fetch_thread(&self, id: &str, tx: &impl ConnectionTrait) -> Result<(), RequestError> {
tracing::info!("crawling replies of '{id}'");
let object = self.pull(id).await?.object()?; let object = self.pull(id).await?.object()?;
tracing::info!("pulled object {object:?}");
let replies = object.replies().resolve(self).await?; let replies = object.replies().resolve(self).await?;
tracing::info!("resolved replies {replies:?}");
let mut page; let mut page;
let mut next = replies.first(); let mut next = replies.first();
tracing::info!("first next: {next:?}");
loop { loop {
page = next.resolve(self).await?; page = next.resolve(self).await?;
tracing::info!("resolved next page: {page:?}");
// fix for mastodon: at some point it introduces ?only_other_accounts=true and then returns a // fix for mastodon: at some point it introduces ?only_other_accounts=true and then returns a
// collection, not a page anymore ??? // collection, not a page anymore ???
@ -422,20 +417,19 @@ impl Fetcher for crate::Context {
page = page.first().extract().ok_or(RequestError::Tombstone)?; page = page.first().extract().ok_or(RequestError::Tombstone)?;
} }
for obj in page.items() { for obj in page.items().flat() {
if let Err(e) = self.fetch_object(obj.id()?, tx).await { if let Err(e) = self.fetch_object(obj.id()?, tx).await {
tracing::warn!("error fetching reply: {e}"); tracing::warn!("error fetching reply: {e}");
} }
} }
for obj in page.ordered_items() { for obj in page.ordered_items().flat() {
if let Err(e) = self.fetch_object(obj.id()?, tx).await { if let Err(e) = self.fetch_object(obj.id()?, tx).await {
tracing::warn!("error fetching reply: {e}"); tracing::warn!("error fetching reply: {e}");
} }
} }
next = page.next(); next = page.next();
tracing::info!("next page: {next:?}");
if next.is_empty() { break }; if next.is_empty() { break };
} }