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

fix: valid ids for inserted things

Browse source
This commit is contained in:
əlemi 2024-03-26 02:24:09 +01:00
parent a7a6a23560
commit 7d1473691e
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/activitypub/user/outbox.rs
View file

@ -121,8 +121,8 @@ pub async fn post(
let Some(object) = activity.object().get().map(|x| x.underlying_json_object()) else { let Some(object) = activity.object().get().map(|x| x.underlying_json_object()) else {
return Err(StatusCode::BAD_REQUEST.into()); return Err(StatusCode::BAD_REQUEST.into());
}; };
let oid = uuid::Uuid::new_v4().to_string(); let oid = ctx.oid(uuid::Uuid::new_v4().to_string());
let aid = uuid::Uuid::new_v4().to_string(); let aid = ctx.aid(uuid::Uuid::new_v4().to_string());
let mut object_model = model::object::Model::new(&object)?; let mut object_model = model::object::Model::new(&object)?;
let mut activity_model = model::activity::Model::new(&activity)?; let mut activity_model = model::activity::Model::new(&activity)?;
object_model.id = oid.clone(); object_model.id = oid.clone();
@ -160,7 +160,7 @@ pub async fn post(
let addressings : Vec<model::addressing::ActiveModel> = addressed let addressings : Vec<model::addressing::ActiveModel> = addressed
.iter() .iter()
.map(|to| model::addressing::ActiveModel { .map(|to| model::addressing::ActiveModel {
server: Set(Context::server(&uid)), server: Set(Context::server(to)),
actor: Set(to.to_string()), actor: Set(to.to_string()),
activity: Set(aid.clone()), activity: Set(aid.clone()),
object: Set(Some(oid.clone())), object: Set(Some(oid.clone())),
@ -196,7 +196,7 @@ pub async fn post(
Ok(CreationResult(aid)) Ok(CreationResult(aid))
}, },
Some(BaseType::Object(ObjectType::Activity(ActivityType::Like))) => { Some(BaseType::Object(ObjectType::Activity(ActivityType::Like))) => {
let aid = uuid::Uuid::new_v4().to_string(); let aid = ctx.aid(uuid::Uuid::new_v4().to_string());
let Some(oid) = activity.object().id().map(|x| x.to_string()) else { let Some(oid) = activity.object().id().map(|x| x.to_string()) else {
return Err(StatusCode::BAD_REQUEST.into()); return Err(StatusCode::BAD_REQUEST.into());
}; };
@ -232,7 +232,7 @@ pub async fn post(
let addressings : Vec<model::addressing::ActiveModel> = addressed let addressings : Vec<model::addressing::ActiveModel> = addressed
.iter() .iter()
.map(|to| model::addressing::ActiveModel { .map(|to| model::addressing::ActiveModel {
server: Set(Context::server(&uid)), server: Set(Context::server(to)),
actor: Set(to.to_string()), actor: Set(to.to_string()),
activity: Set(aid.clone()), activity: Set(aid.clone()),
object: Set(None), object: Set(None),