Add a way to delete articles

Fixes #116

plume-models/src/likes.rs

@@ -48,19 +48,6 @@ impl Like {
         }
     }
 
-    pub fn delete(&self, conn: &PgConnection) -> activity::Undo {
-        diesel::delete(self).execute(conn).unwrap();
-
-        let mut act = activity::Undo::default();
-        act.undo_props.set_actor_link(User::get(conn, self.user_id).unwrap().into_id()).expect("Like::delete: actor error");
-        act.undo_props.set_object_object(self.into_activity(conn)).expect("Like::delete: object error");
-        act.object_props.set_id_string(format!("{}#delete", self.ap_url)).expect("Like::delete: id error");
-        act.object_props.set_to_link(Id::new(PUBLIC_VISIBILTY.to_string())).expect("Like::delete: to error");
-        act.object_props.set_cc_link_vec::<Id>(vec![]).expect("Like::delete: cc error");
-
-        act
-    }
-
     pub fn into_activity(&self, conn: &PgConnection) -> activity::Like {
         let mut act = activity::Like::default();
         act.like_props.set_actor_link(User::get(conn, self.user_id).unwrap().into_id()).expect("Like::into_activity: actor error");
@@ -100,13 +87,23 @@ impl Notify<PgConnection> for Like {
     }
 }
 
-impl Deletable<PgConnection> for Like {
-    fn delete_activity(conn: &PgConnection, id: Id) -> bool {
+impl Deletable<PgConnection, activity::Undo> for Like {
+    fn delete(&self, conn: &PgConnection) -> activity::Undo {
+        diesel::delete(self).execute(conn).unwrap();
+
+        let mut act = activity::Undo::default();
+        act.undo_props.set_actor_link(User::get(conn, self.user_id).unwrap().into_id()).expect("Like::delete: actor error");
+        act.undo_props.set_object_object(self.into_activity(conn)).expect("Like::delete: object error");
+        act.object_props.set_id_string(format!("{}#delete", self.ap_url)).expect("Like::delete: id error");
+        act.object_props.set_to_link(Id::new(PUBLIC_VISIBILTY.to_string())).expect("Like::delete: to error");
+        act.object_props.set_cc_link_vec::<Id>(vec![]).expect("Like::delete: cc error");
+
+        act
+    }
+    
+    fn delete_id(id: String, conn: &PgConnection) {
         if let Some(like) = Like::find_by_ap_url(conn, id.into()) {
             like.delete(conn);
-            true
-        } else {
-            false
         }
     }
 }

plume-models/src/posts.rs

@@ -1,7 +1,7 @@
 use activitypub::{
-    activity::Create,
+    activity::{Create, Delete},
     link,
-    object::Article
+    object::{Article, Tombstone}
 };
 use chrono::{NaiveDateTime, TimeZone, Utc};
 use diesel::{self, PgConnection, RunQueryDsl, QueryDsl, ExpressionMethods, BelongingToDsl, dsl::any};
@@ -10,7 +10,7 @@ use serde_json;
 
 use plume_common::activity_pub::{
     PUBLIC_VISIBILTY, Id, IntoId,
-    inbox::FromActivity
+    inbox::{Deletable, FromActivity}
 };
 use {BASE_URL, ap_url};
 use blogs::Blog;
@@ -273,6 +273,27 @@ impl FromActivity<Article, PgConnection> for Post {
     }
 }
 
+impl Deletable<PgConnection, Delete> for Post {
+    fn delete(&self, conn: &PgConnection) -> Delete {
+        let mut act = Delete::default();
+        act.delete_props.set_actor_link(self.get_authors(conn)[0].clone().into_id()).expect("Post::delete: actor error");
+
+        let mut tombstone = Tombstone::default();
+        tombstone.object_props.set_id_string(self.ap_url.clone()).expect("Post::delete: object.id error");
+        act.delete_props.set_object_object(tombstone).expect("Post::delete: object error");
+
+        act.object_props.set_id_string(format!("{}#delete", self.ap_url)).expect("Post::delete: id error");
+        act.object_props.set_to_link_vec(vec![Id::new(PUBLIC_VISIBILTY)]).expect("Post::delete: to error");
+
+        diesel::delete(self).execute(conn).expect("Post::delete: DB error");
+        act
+    }
+
+    fn delete_id(id: String, conn: &PgConnection) {
+        Post::find_by_ap_url(conn, id).map(|p| p.delete(conn));
+    }
+}
+
 impl IntoId for Post {
     fn into_id(self) -> Id {
         Id::new(self.ap_url.clone())

plume-models/src/reshares.rs

@@ -59,19 +59,6 @@ impl Reshare {
         User::get(conn, self.user_id)
     }
 
-    pub fn delete(&self, conn: &PgConnection) -> Undo {
-        diesel::delete(self).execute(conn).unwrap();
-
-        let mut act = Undo::default();
-        act.undo_props.set_actor_link(User::get(conn, self.user_id).unwrap().into_id()).unwrap();
-        act.undo_props.set_object_object(self.into_activity(conn)).unwrap();
-        act.object_props.set_id_string(format!("{}#delete", self.ap_url)).expect("Reshare::delete: id error");
-        act.object_props.set_to_link(Id::new(PUBLIC_VISIBILTY.to_string())).expect("Reshare::delete: to error");
-        act.object_props.set_cc_link_vec::<Id>(vec![]).expect("Reshare::delete: cc error");
-
-        act
-    }
-
     pub fn into_activity(&self, conn: &PgConnection) -> Announce {
         let mut act = Announce::default();
         act.announce_props.set_actor_link(User::get(conn, self.user_id).unwrap().into_id()).unwrap();
@@ -111,13 +98,23 @@ impl Notify<PgConnection> for Reshare {
     }
 }
 
-impl Deletable<PgConnection> for Reshare {
-    fn delete_activity(conn: &PgConnection, id: Id) -> bool {
-        if let Some(reshare) = Reshare::find_by_ap_url(conn, id.into()) {
+impl Deletable<PgConnection, Undo> for Reshare {
+    fn delete(&self, conn: &PgConnection) -> Undo {
+        diesel::delete(self).execute(conn).unwrap();
+
+        let mut act = Undo::default();
+        act.undo_props.set_actor_link(User::get(conn, self.user_id).unwrap().into_id()).unwrap();
+        act.undo_props.set_object_object(self.into_activity(conn)).unwrap();
+        act.object_props.set_id_string(format!("{}#delete", self.ap_url)).expect("Reshare::delete: id error");
+        act.object_props.set_to_link(Id::new(PUBLIC_VISIBILTY.to_string())).expect("Reshare::delete: to error");
+        act.object_props.set_cc_link_vec::<Id>(vec![]).expect("Reshare::delete: cc error");
+
+        act
+    }
+
+    fn delete_id(id: String, conn: &PgConnection) {
+        if let Some(reshare) = Reshare::find_by_ap_url(conn, id) {
             reshare.delete(conn);
-            true
-        } else {
-            false
         }
     }
 }