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

feat: command to also accept relay follow reqs

Browse source 
this has quite awful UX because you can't really know if relay is
following back without checking logs, but whatevvvv works for now
This commit is contained in:
əlemi 2024-04-23 16:26:08 +02:00
parent dfbadf5d11
commit 2a9cf5bcf5
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/main.rs
View file

@ -11,7 +11,7 @@ mod migrations;
use sea_orm_migration::MigratorTrait; use sea_orm_migration::MigratorTrait;
use clap::{Parser, Subcommand}; use clap::{Parser, Subcommand};
use sea_orm::{ConnectOptions, Database, EntityTrait, IntoActiveModel}; use sea_orm::{ColumnTrait, ConnectOptions, Database, EntityTrait, IntoActiveModel, QueryFilter, QueryOrder};
pub use errors::UpubResult as Result; pub use errors::UpubResult as Result;
use tower_http::{cors::CorsLayer, trace::TraceLayer}; use tower_http::{cors::CorsLayer, trace::TraceLayer};
@ -70,6 +70,9 @@ enum CliCommand {
Relay { Relay {
/// actor url, same as with pleroma /// actor url, same as with pleroma
actor: String, actor: String,
#[arg(long, default_value_t = false)]
accept: bool
} }
} }
@ -104,13 +107,13 @@ async fn main() {
CliCommand::Fetch { uri, save } => fetch(db, args.domain, uri, save) CliCommand::Fetch { uri, save } => fetch(db, args.domain, uri, save)
.await.expect("error fetching object"), .await.expect("error fetching object"),
CliCommand::Relay { actor } => { CliCommand::Relay { actor, accept } => {
let ctx = server::Context::new(db, args.domain) let ctx = server::Context::new(db, args.domain)
.await.expect("failed creating server context"); .await.expect("failed creating server context");
let aid = ctx.aid(uuid::Uuid::new_v4().to_string()); let aid = ctx.aid(uuid::Uuid::new_v4().to_string());
let activity_model = model::activity::Model { let mut activity_model = model::activity::Model {
id: aid.clone(), id: aid.clone(),
activity_type: apb::ActivityType::Follow, activity_type: apb::ActivityType::Follow,
actor: ctx.base(), actor: ctx.base(),
@ -122,11 +125,26 @@ async fn main() {
cc: model::Audience(vec![apb::target::PUBLIC.to_string()]), cc: model::Audience(vec![apb::target::PUBLIC.to_string()]),
bcc: model::Audience::default(), bcc: model::Audience::default(),
}; };
if accept {
let follow_req = model::activity::Entity::find()
.filter(model::activity::Column::ActivityType.eq("Follow"))
.filter(model::activity::Column::Actor.eq(&actor))
.filter(model::activity::Column::Object.eq(ctx.base()))
.order_by_desc(model::activity::Column::Published)
.one(ctx.db())
.await
.expect("failed querying db for relay follow req")
.expect("no follow request to accept");
activity_model.activity_type = apb::ActivityType::Accept(apb::AcceptType::Accept);
activity_model.object = Some(follow_req.id);
};
model::activity::Entity::insert(activity_model.into_active_model()) model::activity::Entity::insert(activity_model.into_active_model())
.exec(ctx.db()).await.expect("could not insert activity in db"); .exec(ctx.db()).await.expect("could not insert activity in db");
ctx.dispatch(&ctx.base(), vec![actor], &aid, None).await ctx.dispatch(&ctx.base(), vec![actor], &aid, None).await
.expect("could not dispatch follow"); .expect("could not dispatch relay activity");
}, },
CliCommand::Serve => { CliCommand::Serve => {