From cf41ae5fda3da42d3fde7d46e3233acd17022cad Mon Sep 17 00:00:00 2001
From: Bat <baptiste@gelez.xyz>
Date: Wed, 2 May 2018 22:36:13 +0100
Subject: [PATCH] Refactor activity_pub::activity::Activity
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I only had to wrap it in Arc… -_-
---
 src/activity_pub/activity.rs | 22 +---------------------
 src/activity_pub/outbox.rs   | 11 ++++++-----
 src/models/blogs.rs          |  5 +++--
 src/models/users.rs          |  7 ++++---
 src/routes/blogs.rs          |  3 +--
 5 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/src/activity_pub/activity.rs b/src/activity_pub/activity.rs
index 6e0b47c..f3f77d9 100644
--- a/src/activity_pub/activity.rs
+++ b/src/activity_pub/activity.rs
@@ -6,7 +6,7 @@ use std::str::FromStr;
 use activity_pub::actor::Actor;
 use activity_pub::object::Object;
 
-pub trait Activity: ActivityClone {
+pub trait Activity {
     fn get_id(&self) -> String;
 
     fn serialize(&self) -> serde_json::Value;
@@ -14,26 +14,6 @@ pub trait Activity: ActivityClone {
     // fn deserialize(serde_json::Value) -> Self;
 }
 
-trait ActivityClone {
-    fn clone_box(&self) -> Box<Activity>;
-}
-
-impl<T> ActivityClone for T
-where
-    T: 'static + Activity + Clone,
-{
-    fn clone_box(&self) -> Box<Activity> {
-        Box::new(self.clone())
-    }
-}
-
-// We can now implement Clone manually by forwarding to clone_box.
-impl Clone for Box<Activity> {
-    fn clone(&self) -> Box<Activity> {
-        self.clone_box()
-    }
-}
-
 #[derive(Clone)]
 pub struct Accept {
     id: String,
diff --git a/src/activity_pub/outbox.rs b/src/activity_pub/outbox.rs
index 9aa891d..2902007 100644
--- a/src/activity_pub/outbox.rs
+++ b/src/activity_pub/outbox.rs
@@ -3,19 +3,20 @@ use rocket::http::Status;
 use rocket::response::{Response, Responder};
 use rocket::request::Request;
 use serde_json;
+use std::sync::Arc;
 
 use activity_pub::{activity_pub, ActivityPub, context};
 use activity_pub::activity::Activity;
 use activity_pub::actor::Actor;
 use models::users::User;
 
-pub struct Outbox<A> where A: Activity + Clone {
+pub struct Outbox {
     id: String,
-    items: Vec<Box<A>>
+    items: Vec<Arc<Activity>>
 }
 
-impl<A: Activity + Clone + 'static> Outbox<A> {
-    pub fn new(id: String, items: Vec<Box<A>>) -> Outbox<A> {
+impl Outbox {
+    pub fn new(id: String, items: Vec<Arc<Activity>>) -> Outbox {
         Outbox {
             id: id,
             items: items
@@ -34,7 +35,7 @@ impl<A: Activity + Clone + 'static> Outbox<A> {
     }
 }
 
-impl<'r, A: Activity + Clone + 'static> Responder<'r> for Outbox<A> {
+impl<'r> Responder<'r> for Outbox {
     fn respond_to(self, request: &Request) -> Result<Response<'r>, Status> {
         self.serialize().respond_to(request)
     }
diff --git a/src/models/blogs.rs b/src/models/blogs.rs
index 0957c43..29b528f 100644
--- a/src/models/blogs.rs
+++ b/src/models/blogs.rs
@@ -1,5 +1,6 @@
 use chrono::NaiveDateTime;
 use diesel::{self, QueryDsl, RunQueryDsl, ExpressionMethods, PgConnection};
+use std::sync::Arc;
 
 use activity_pub::activity::Activity;
 use activity_pub::actor::{Actor, ActorType};
@@ -78,11 +79,11 @@ impl Blog {
         }
     }
 
-    pub fn outbox<A: Activity + Clone + 'static>(&self, conn: &PgConnection) -> Outbox<A> {
+    pub fn outbox(&self, conn: &PgConnection) -> Outbox {
         Outbox::new(self.compute_outbox(conn), self.get_activities(conn))
     }
 
-    fn get_activities<A: Activity + Clone>(&self, _conn: &PgConnection) -> Vec<Box<A>> {
+    fn get_activities(&self, _conn: &PgConnection) -> Vec<Arc<Activity>> {
         vec![]
     }
 }
diff --git a/src/models/users.rs b/src/models/users.rs
index 8a57ac9..84ad958 100644
--- a/src/models/users.rs
+++ b/src/models/users.rs
@@ -8,6 +8,7 @@ use reqwest::mime::Mime;
 use rocket::request::{self, FromRequest, Request};
 use rocket::outcome::IntoOutcome;
 use serde_json;
+use std::sync::Arc;
 use url::Url;
 
 use BASE_URL;
@@ -184,16 +185,16 @@ impl User {
         }
     }
 
-    pub fn outbox<A: Activity + Clone + 'static>(&self, conn: &PgConnection) -> Outbox<A> {
+    pub fn outbox(&self, conn: &PgConnection) -> Outbox {
         Outbox::new(self.compute_outbox(conn), self.get_activities(conn))
     }
 
-    fn get_activities<A: Activity>(&self, conn: &PgConnection) -> Vec<Box<A>> {
+    fn get_activities(&self, conn: &PgConnection) -> Vec<Arc<Activity>> {
         use schema::posts;
         use schema::post_authors;
         let posts_by_self = PostAuthor::belonging_to(self).select(post_authors::post_id);
         let posts = posts::table.filter(posts::id.eq(any(posts_by_self))).load::<Post>(conn).unwrap();
-        posts.into_iter().map(|p| Box::new(Create::new(self, &p, conn)) as Box<A>).collect::<Vec<Box<A>>>()
+        posts.into_iter().map(|p| Arc::new(Create::new(self, &p, conn)) as Arc<Activity>).collect::<Vec<Arc<Activity>>>()
     }
 
     pub fn get_followers(&self, conn: &PgConnection) -> Vec<User> {
diff --git a/src/routes/blogs.rs b/src/routes/blogs.rs
index 4bc619b..ace2597 100644
--- a/src/routes/blogs.rs
+++ b/src/routes/blogs.rs
@@ -4,7 +4,6 @@ use rocket_contrib::Template;
 use std::collections::HashMap;
 
 use activity_pub::ActivityPub;
-use activity_pub::activity::Activity;
 use activity_pub::actor::Actor;
 use activity_pub::outbox::Outbox;
 use db_conn::DbConn;
@@ -58,7 +57,7 @@ fn create(conn: DbConn, data: Form<NewBlogForm>, user: User) -> Redirect {
 }
 
 #[get("/~/<name>/outbox")]
-fn outbox<A: Activity + Clone + 'static>(name: String, conn: DbConn) -> Outbox<A> {
+fn outbox(name: String, conn: DbConn) -> Outbox {
     let blog = Blog::find_by_actor_id(&*conn, name).unwrap();
     blog.outbox(&*conn)
 }