From 851f30dc2404bc010e31238a47ce0063c27107f8 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Fri, 1 Dec 2023 16:07:22 +0100
Subject: [PATCH] remove dbedit.local

---
 migrations/2023-11-28-150402_article/up.sql | 3 +--
 src/database/edit.rs                        | 5 -----
 src/database/schema.rs                      | 1 -
 src/federation/activities/mod.rs            | 1 -
 src/federation/objects/edit.rs              | 1 -
 tests/test.rs                               | 1 -
 6 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/migrations/2023-11-28-150402_article/up.sql b/migrations/2023-11-28-150402_article/up.sql
index 4bddca6..bc988c8 100644
--- a/migrations/2023-11-28-150402_article/up.sql
+++ b/migrations/2023-11-28-150402_article/up.sql
@@ -13,6 +13,5 @@ create table edit (
     diff text not null,
     article_id int REFERENCES article ON UPDATE CASCADE ON DELETE CASCADE NOT NULL,
     version text not null,
-    previous_version text not null,
-    local bool not null
+    previous_version text not null
 )
\ No newline at end of file
diff --git a/src/database/edit.rs b/src/database/edit.rs
index 6a025e5..6c0b50a 100644
--- a/src/database/edit.rs
+++ b/src/database/edit.rs
@@ -35,8 +35,6 @@ pub struct DbEdit {
     pub version: EditVersion,
     // TODO: could be an Option<DbEdit.id> instead
     pub previous_version: EditVersion,
-    // TODO: there is already `local` field on article, do we need this?
-    pub local: bool,
 }
 
 #[derive(Debug, Clone, Insertable, AsChangeset)]
@@ -47,7 +45,6 @@ pub struct DbEditForm {
     pub article_id: i32,
     pub version: EditVersion,
     pub previous_version: EditVersion,
-    pub local: bool,
 }
 
 impl DbEditForm {
@@ -64,7 +61,6 @@ impl DbEditForm {
             article_id: original_article.id,
             version: EditVersion(hash),
             previous_version,
-            local: true,
         })
     }
 
@@ -106,7 +102,6 @@ impl DbEdit {
             article_id: article.id,
             version: self.version,
             previous_version: self.previous_version,
-            local: true,
         })
     }
 }
diff --git a/src/database/schema.rs b/src/database/schema.rs
index 33bf963..7adad37 100644
--- a/src/database/schema.rs
+++ b/src/database/schema.rs
@@ -22,7 +22,6 @@ diesel::table! {
         article_id -> Int4,
         version -> Text,
         previous_version -> Text,
-        local -> Bool,
     }
 }
 
diff --git a/src/federation/activities/mod.rs b/src/federation/activities/mod.rs
index 2960bd6..8e73229 100644
--- a/src/federation/activities/mod.rs
+++ b/src/federation/activities/mod.rs
@@ -36,7 +36,6 @@ pub async fn submit_article_update(
             article_id: form.article_id,
             version: form.version,
             previous_version: form.previous_version,
-            local: form.local,
         };
         let instance: DbInstance = original_article
             .instance_id
diff --git a/src/federation/objects/edit.rs b/src/federation/objects/edit.rs
index db27f99..1f9ad65 100644
--- a/src/federation/objects/edit.rs
+++ b/src/federation/objects/edit.rs
@@ -67,7 +67,6 @@ impl Object for DbEdit {
             article_id: article.id,
             version: json.version,
             previous_version: json.previous_version,
-            local: false,
         };
         let edit = DbEdit::create(&form, &data.db_connection)?;
         Ok(edit)
diff --git a/tests/test.rs b/tests/test.rs
index 20d4930..065b966 100644
--- a/tests/test.rs
+++ b/tests/test.rs
@@ -453,7 +453,6 @@ async fn test_fork_article() -> MyResult<()> {
     assert_eq!(resolve_res.edits[0].diff, fork_res.edits[0].diff);
     assert_eq!(resolve_res.edits[0].version, fork_res.edits[0].version);
     assert_ne!(resolve_res.edits[0].id, fork_res.edits[0].id);
-    assert!(fork_res.edits[0].local);
     assert_eq!(resolve_res.latest_version, fork_res.latest_version);
     assert_ne!(resolved_article.ap_id, forked_article.ap_id);
     assert!(forked_article.local);