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

fix: increment share and like counters for outbox

Browse source
This commit is contained in:
əlemi 2024-04-29 20:40:20 +02:00
parent 5ae9a140b4
commit 4fe53f7011
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/server/outbox.rs
View file

@ -100,9 +100,8 @@ impl apb::server::Outbox for Context {
async fn like(&self, uid: String, activity: serde_json::Value) -> crate::Result<String> { async fn like(&self, uid: String, activity: serde_json::Value) -> crate::Result<String> {
let aid = self.aid(uuid::Uuid::new_v4().to_string()); let aid = self.aid(uuid::Uuid::new_v4().to_string());
let activity_targets = activity.addressed(); let activity_targets = activity.addressed();
let Some(oid) = activity.object().id() else { let oid = activity.object().id().ok_or_else(UpubError::bad_request)?;
return Err(UpubError::bad_request()); self.fetch_object(&oid).await?;
};
let activity_model = model::activity::Model::new( let activity_model = model::activity::Model::new(
&activity &activity
.set_id(Some(&aid)) .set_id(Some(&aid))
@ -112,13 +111,18 @@ impl apb::server::Outbox for Context {
let like_model = model::like::ActiveModel { let like_model = model::like::ActiveModel {
actor: Set(uid.clone()), actor: Set(uid.clone()),
likes: Set(oid), likes: Set(oid.clone()),
date: Set(chrono::Utc::now()), date: Set(chrono::Utc::now()),
..Default::default() ..Default::default()
}; };
model::like::Entity::insert(like_model).exec(self.db()).await?; model::like::Entity::insert(like_model).exec(self.db()).await?;
model::activity::Entity::insert(activity_model.into_active_model()) model::activity::Entity::insert(activity_model.into_active_model())
.exec(self.db()).await?; .exec(self.db()).await?;
model::object::Entity::update_many()
.col_expr(model::object::Column::Likes, Expr::col(model::object::Column::Likes).add(1))
.filter(model::object::Column::Id.eq(oid))
.exec(self.db())
.await?;
self.dispatch(&uid, activity_targets, &aid, None).await?; self.dispatch(&uid, activity_targets, &aid, None).await?;
@ -338,6 +342,7 @@ impl apb::server::Outbox for Context {
let aid = self.aid(uuid::Uuid::new_v4().to_string()); let aid = self.aid(uuid::Uuid::new_v4().to_string());
let activity_targets = activity.addressed(); let activity_targets = activity.addressed();
let oid = activity.object().id().ok_or_else(UpubError::bad_request)?; let oid = activity.object().id().ok_or_else(UpubError::bad_request)?;
self.fetch_object(&oid).await?;
let activity_model = model::activity::Model::new( let activity_model = model::activity::Model::new(
&activity &activity
.set_id(Some(&aid)) .set_id(Some(&aid))
@ -347,13 +352,18 @@ impl apb::server::Outbox for Context {
let share_model = model::share::ActiveModel { let share_model = model::share::ActiveModel {
actor: Set(uid.clone()), actor: Set(uid.clone()),
shares: Set(oid), shares: Set(oid.clone()),
date: Set(chrono::Utc::now()), date: Set(chrono::Utc::now()),
..Default::default() ..Default::default()
}; };
model::share::Entity::insert(share_model).exec(self.db()).await?; model::share::Entity::insert(share_model).exec(self.db()).await?;
model::activity::Entity::insert(activity_model.into_active_model()) model::activity::Entity::insert(activity_model.into_active_model())
.exec(self.db()).await?; .exec(self.db()).await?;
model::object::Entity::update_many()
.col_expr(model::object::Column::Shares, Expr::col(model::object::Column::Shares).add(1))
.filter(model::object::Column::Id.eq(oid))
.exec(self.db())
.await?;
self.dispatch(&uid, activity_targets, &aid, None).await?; self.dispatch(&uid, activity_targets, &aid, None).await?;