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

fix(cli): delete users if they got deleted

Browse source 
so they wont be retried the next time we start this command
This commit is contained in:
əlemi 2024-07-20 10:57:25 +02:00
parent e938f3bb27
commit 1ad2ac05fa
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
upub/cli/src/update.rs
View file

@ -1,5 +1,5 @@
use futures::TryStreamExt; use futures::TryStreamExt;
use sea_orm::{ActiveModelTrait, ActiveValue::Set, ColumnTrait, EntityTrait, QueryFilter}; use sea_orm::{ActiveModelTrait, ActiveValue::Set, ColumnTrait, EntityTrait, QueryFilter, ModelTrait};
use upub::traits::Fetcher; use upub::traits::Fetcher;
pub async fn update_users(ctx: upub::Context, days: i64, limit: Option<u64>) -> Result<(), sea_orm::DbErr> { pub async fn update_users(ctx: upub::Context, days: i64, limit: Option<u64>) -> Result<(), sea_orm::DbErr> {
@ -15,10 +15,22 @@ pub async fn update_users(ctx: upub::Context, days: i64, limit: Option<u64>) ->
if let Some(limit) = limit { if let Some(limit) = limit {
if count >= limit { break } if count >= limit { break }
} }
match ctx.pull(&user.id).await.map(|x| x.actor()) { match ctx.pull(&user.id).await.and_then(|x| x.actor()) {
Err(e) => tracing::warn!("could not update user {}: {e}", user.id), Err(upub::traits::fetch::RequestError::Fetch(status, msg)) => {
Ok(Err(e)) => tracing::warn!("could not update user {}: {e}", user.id), if status.as_u16() == 410 {
Ok(Ok(doc)) => match upub::AP::actor_q(&doc, Some(user.internal)) { tracing::info!("user {} has been deleted", user.id);
user.delete(ctx.db()).await?;
}
else if status.as_u16() == 404 {
tracing::info!("user {} does not exist anymore", user.id);
user.delete(ctx.db()).await?;
}
else {
tracing::warn!("could not fetch user {}: failed with status {status} -- {msg}", user.id);
}
},
Err(e) => tracing::warn!("could not fetch user {}: {e}", user.id),
Ok(doc) => match upub::AP::actor_q(&doc, Some(user.internal)) {
Ok(mut u) => { Ok(mut u) => {
tracing::info!("updating user {}", user.id); tracing::info!("updating user {}", user.id);
u.updated = Set(chrono::Utc::now()); u.updated = Set(chrono::Utc::now());