zaaarf/upub
1
0
Fork 0
forked from alemi/upub
Code Pull requests Activity

feat: implemented relay unfollow/remove, fixes

Browse source
This commit is contained in:
əlemi 2024-06-25 05:25:57 +02:00
parent e6b40f0239
commit ae4950b2e7
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 87 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
upub/cli/src/relay.rs
View file

@ -30,14 +30,26 @@ pub enum RelayCommand {
} }
pub async fn relay(ctx: upub::Context, action: RelayCommand) -> Result<(), PullError> { pub async fn relay(ctx: upub::Context, action: RelayCommand) -> Result<(), PullError> {
match action { let my_internal = upub::model::actor::Entity::ap_to_internal(ctx.base(), ctx.db())
RelayCommand::Status => {
let internal_actor = upub::model::actor::Entity::ap_to_internal(ctx.base(), ctx.db())
.await? .await?
.ok_or_else(|| DbErr::RecordNotFound(ctx.base().to_string()))?; .ok_or_else(|| DbErr::RecordNotFound(ctx.base().to_string()))?;
let their_internal = match &action {
RelayCommand::Status => 0,
RelayCommand::Follow { actor }
| RelayCommand::Accept { actor }
| RelayCommand::Unfollow { actor }
| RelayCommand::Remove { actor }
=>
upub::model::actor::Entity::ap_to_internal(actor, ctx.db())
.await?
.ok_or_else(|| DbErr::RecordNotFound(actor.clone()))?,
};
match action {
RelayCommand::Status => {
tracing::info!("active sinks:"); tracing::info!("active sinks:");
for sink in upub::Query::related(None, Some(internal_actor), false) for sink in upub::Query::related(None, Some(my_internal), false)
.into_model::<upub::model::actor::Model>() .into_model::<upub::model::actor::Model>()
.all(ctx.db()) .all(ctx.db())
.await? .await?
@ -46,7 +58,7 @@ pub async fn relay(ctx: upub::Context, action: RelayCommand) -> Result<(), PullE
} }
tracing::info!("active sources:"); tracing::info!("active sources:");
for source in upub::Query::related(Some(internal_actor), None, false) for source in upub::Query::related(Some(my_internal), None, false)
.into_model::<upub::model::actor::Model>() .into_model::<upub::model::actor::Model>()
.all(ctx.db()) .all(ctx.db())
.await? .await?
@ -81,12 +93,6 @@ pub async fn relay(ctx: upub::Context, action: RelayCommand) -> Result<(), PullE
}, },
RelayCommand::Accept { actor } => { RelayCommand::Accept { actor } => {
let their_internal = upub::model::actor::Entity::ap_to_internal(&actor, ctx.db())
.await?
.ok_or_else(|| DbErr::RecordNotFound(actor.clone()))?;
let my_internal = upub::model::actor::Entity::ap_to_internal(ctx.base(), ctx.db())
.await?
.ok_or_else(|| DbErr::RecordNotFound(ctx.base().to_string()))?;
let relation = upub::model::relation::Entity::find() let relation = upub::model::relation::Entity::find()
.filter(upub::model::relation::Column::Follower.eq(their_internal)) .filter(upub::model::relation::Column::Follower.eq(their_internal))
.filter(upub::model::relation::Column::Following.eq(my_internal)) .filter(upub::model::relation::Column::Following.eq(my_internal))
@ -121,9 +127,76 @@ pub async fn relay(ctx: upub::Context, action: RelayCommand) -> Result<(), PullE
upub::model::job::Entity::insert(job).exec(ctx.db()).await?; upub::model::job::Entity::insert(job).exec(ctx.db()).await?;
}, },
RelayCommand::Remove { .. } => todo!(), RelayCommand::Remove { actor } => {
let relation = upub::model::relation::Entity::find()
.filter(upub::model::relation::Column::Follower.eq(their_internal))
.filter(upub::model::relation::Column::Following.eq(my_internal))
.one(ctx.db())
.await?
.ok_or_else(|| DbErr::RecordNotFound(format!("relation-{their_internal}-{my_internal}")))?;
let accept_activity_id = relation.accept.ok_or(DbErr::RecordNotFound(format!("accept-{their_internal}-{my_internal}")))?;
let activity = upub::model::activity::Entity::find_by_id(accept_activity_id)
.one(ctx.db())
.await?
.ok_or_else(|| DbErr::RecordNotFound(format!("activity#{}", accept_activity_id)))?;
let aid = ctx.aid(&upub::Context::new_id());
let payload = apb::new()
.set_id(Some(&aid))
.set_activity_type(Some(apb::ActivityType::Undo))
.set_actor(apb::Node::link(ctx.base().to_string()))
.set_object(apb::Node::object(activity.ap()))
.set_to(apb::Node::links(vec![actor.clone()]))
.set_cc(apb::Node::links(vec![apb::target::PUBLIC.to_string()]))
.set_published(Some(chrono::Utc::now()));
let job = upub::model::job::ActiveModel {
internal: NotSet,
activity: Set(aid.clone()),
job_type: Set(upub::model::job::JobType::Outbound),
actor: Set(ctx.base().to_string()),
target: Set(None),
payload: Set(Some(payload)),
attempt: Set(0),
published: Set(chrono::Utc::now()),
not_before: Set(chrono::Utc::now()),
};
tracing::info!("unfollowing relay {actor}");
upub::model::job::Entity::insert(job).exec(ctx.db()).await?;
},
RelayCommand::Unfollow { .. } => todo!(), RelayCommand::Unfollow { actor } => {
let relation = upub::model::relation::Entity::find()
.filter(upub::model::relation::Column::Follower.eq(my_internal))
.filter(upub::model::relation::Column::Following.eq(their_internal))
.one(ctx.db())
.await?
.ok_or_else(|| DbErr::RecordNotFound(format!("relation-{my_internal}-{their_internal}")))?;
let activity = upub::model::activity::Entity::find_by_id(relation.activity)
.one(ctx.db())
.await?
.ok_or_else(|| DbErr::RecordNotFound(format!("activity#{}", relation.activity)))?;
let aid = ctx.aid(&upub::Context::new_id());
let payload = apb::new()
.set_id(Some(&aid))
.set_activity_type(Some(apb::ActivityType::Undo))
.set_actor(apb::Node::link(ctx.base().to_string()))
.set_object(apb::Node::object(activity.ap()))
.set_to(apb::Node::links(vec![actor.clone()]))
.set_cc(apb::Node::links(vec![apb::target::PUBLIC.to_string()]))
.set_published(Some(chrono::Utc::now()));
let job = upub::model::job::ActiveModel {
internal: NotSet,
activity: Set(aid.clone()),
job_type: Set(upub::model::job::JobType::Outbound),
actor: Set(ctx.base().to_string()),
target: Set(None),
payload: Set(Some(payload)),
attempt: Set(0),
published: Set(chrono::Utc::now()),
not_before: Set(chrono::Utc::now()),
};
tracing::info!("unfollowing relay {actor}");
upub::model::job::Entity::insert(job).exec(ctx.db()).await?;
},
} }
Ok(()) Ok(())