From abb5ee0ce4b330abfa96ec0f3888bd3f8a506cf7 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Fri, 24 Nov 2023 14:36:34 +0100 Subject: [PATCH] store edits inside edit.rs, avoid code duplication --- src/api.rs | 12 ++++----- src/federation/activities/update_article.rs | 22 +++++----------- src/federation/objects/edit.rs | 29 ++++++++++++++------- src/federation/objects/edits_collection.rs | 14 +--------- tests/test.rs | 4 ++- 5 files changed, 36 insertions(+), 45 deletions(-) diff --git a/src/api.rs b/src/api.rs index f8c182a..4187296 100644 --- a/src/api.rs +++ b/src/api.rs @@ -1,15 +1,15 @@ use crate::database::DatabaseHandle; -use crate::error::{Error, MyResult}; +use crate::error::{MyResult}; use crate::federation::activities::create_article::CreateArticle; use crate::federation::activities::update_article::UpdateArticle; -use crate::federation::objects::article::{ApubArticle, DbArticle}; +use crate::federation::objects::article::{DbArticle}; use crate::federation::objects::edit::DbEdit; -use crate::federation::objects::instance::{ApubInstance, DbInstance}; +use crate::federation::objects::instance::{DbInstance}; use activitypub_federation::config::Data; use activitypub_federation::fetch::object_id::ObjectId; -use activitypub_federation::traits::Object; + use anyhow::anyhow; -use async_trait::async_trait; + use axum::extract::Query; use axum::routing::{get, post}; use axum::{Form, Json, Router}; @@ -65,7 +65,7 @@ async fn create_article( Ok(Json(article)) } -#[derive(Deserialize, Serialize)] +#[derive(Deserialize, Serialize, Debug)] pub struct EditArticleData { pub ap_id: ObjectId, pub new_text: String, diff --git a/src/federation/activities/update_article.rs b/src/federation/activities/update_article.rs index c8e8f91..be16a6c 100644 --- a/src/federation/activities/update_article.rs +++ b/src/federation/activities/update_article.rs @@ -11,7 +11,7 @@ use activitypub_federation::{ protocol::helpers::deserialize_one_or_many, traits::{ActivityHandler, Object}, }; -use diffy::{apply, Patch}; + use serde::{Deserialize, Serialize}; use url::Url; @@ -21,8 +21,7 @@ pub struct UpdateArticle { pub actor: ObjectId, #[serde(deserialize_with = "deserialize_one_or_many")] pub to: Vec, - pub object: ObjectId, - pub result: ApubEdit, + pub object: ApubEdit, #[serde(rename = "type")] pub kind: CreateType, pub id: Url, @@ -40,8 +39,7 @@ impl UpdateArticle { let update = UpdateArticle { actor: local_instance.ap_id.clone(), to: local_instance.follower_ids(), - object: article.ap_id, - result: edit.into_json(data).await?, + object: edit.into_json(data).await?, kind: Default::default(), id, }; @@ -51,8 +49,7 @@ impl UpdateArticle { let update = UpdateArticle { actor: local_instance.ap_id.clone(), to: vec![article_instance.ap_id.into_inner()], - object: article.ap_id, - result: edit.into_json(data).await?, + object: edit.into_json(data).await?, kind: Default::default(), id, }; @@ -82,13 +79,9 @@ impl ActivityHandler for UpdateArticle { async fn receive(self, data: &Data) -> Result<(), Self::Error> { let article_local = { - let edit = DbEdit::from_json(self.result.clone(), data).await?; - let mut lock = data.articles.lock().unwrap(); - let article = lock.get_mut(self.object.inner()).unwrap(); - article.edits.push(edit); - // TODO: probably better to apply patch inside DbEdit::from_json() - let patch = Patch::from_str(&self.result.diff)?; - article.text = apply(&article.text, &patch)?; + DbEdit::from_json(self.object.clone(), data).await?; + let lock = data.articles.lock().unwrap(); + let article = lock.get(self.object.object.inner()).unwrap(); article.local }; @@ -101,7 +94,6 @@ impl ActivityHandler for UpdateArticle { actor: local_instance.ap_id.clone(), to: local_instance.follower_ids(), object: self.object, - result: self.result, kind: Default::default(), id, }; diff --git a/src/federation/objects/edit.rs b/src/federation/objects/edit.rs index 2b12182..42578c6 100644 --- a/src/federation/objects/edit.rs +++ b/src/federation/objects/edit.rs @@ -4,7 +4,7 @@ use crate::federation::objects::article::DbArticle; use activitypub_federation::config::Data; use activitypub_federation::fetch::object_id::ObjectId; use activitypub_federation::traits::Object; -use diffy::create_patch; +use diffy::{apply, create_patch, Patch}; use serde::{Deserialize, Serialize}; use sha2::Digest; use sha2::Sha224; @@ -15,6 +15,7 @@ use url::Url; pub struct DbEdit { pub id: ObjectId, pub diff: String, + pub article_id: ObjectId, pub local: bool, } @@ -28,6 +29,7 @@ impl DbEdit { Ok(DbEdit { id: edit_id, diff: diff.to_string(), + article_id: original_article.ap_id.clone(), local: true, }) } @@ -44,7 +46,8 @@ pub struct ApubEdit { #[serde(rename = "type")] kind: EditType, id: ObjectId, - pub(crate) diff: String, + pub(crate) content: String, + pub object: ObjectId, } #[async_trait::async_trait] @@ -64,7 +67,8 @@ impl Object for DbEdit { Ok(ApubEdit { kind: EditType::Edit, id: self.id, - diff: self.diff, + content: self.diff, + object: self.article_id, }) } @@ -76,14 +80,19 @@ impl Object for DbEdit { Ok(()) } - async fn from_json( - json: Self::Kind, - _data: &Data, - ) -> Result { - Ok(Self { + async fn from_json(json: Self::Kind, data: &Data) -> Result { + let edit = Self { id: json.id, - diff: json.diff, + diff: json.content, + article_id: json.object, local: false, - }) + }; + let mut lock = data.articles.lock().unwrap(); + let article = lock.get_mut(edit.article_id.inner()).unwrap(); + article.edits.push(edit.clone()); + let patch = Patch::from_str(&edit.diff)?; + article.text = apply(&article.text, &patch)?; + + Ok(edit) } } diff --git a/src/federation/objects/edits_collection.rs b/src/federation/objects/edits_collection.rs index 1eeaaa9..5543586 100644 --- a/src/federation/objects/edits_collection.rs +++ b/src/federation/objects/edits_collection.rs @@ -68,23 +68,11 @@ impl Collection for DbEditCollection { async fn from_json( apub: Self::Kind, - owner: &Self::Owner, + _owner: &Self::Owner, data: &Data, ) -> Result { let edits = try_join_all(apub.items.into_iter().map(|i| DbEdit::from_json(i, data))).await?; - let mut articles = data.articles.lock().unwrap(); - let article = articles.get_mut(owner.ap_id.inner()).unwrap(); - let edit_ids = article - .edits - .iter() - .map(|e| e.id.clone()) - .collect::>(); - for e in edits.clone() { - if !edit_ids.contains(&&e.id) { - article.edits.push(e); - } - } // TODO: return value propably not needed Ok(DbEditCollection(edits)) } diff --git a/tests/test.rs b/tests/test.rs index 28360e1..27a0545 100644 --- a/tests/test.rs +++ b/tests/test.rs @@ -292,7 +292,9 @@ async fn test_edit_conflict() -> MyResult<()> { ap_id: create_res.ap_id, new_text: "Ipsum Lorem".to_string(), }; - let edit_res: DbArticle = patch(data.hostname_gamma, "article", &edit_form).await?; + dbg!(&edit_form); + let edit_res: DbArticle = dbg!(patch(data.hostname_gamma, "article", &edit_form).await)?; + dbg!(&edit_res); assert_eq!(edit_res.text, edit_form.new_text); assert_eq!(edit_res.edits.len(), 1); assert!(!edit_res.local);