Merge pull request #27 from Plume-org/activitystreams

Use the Activitystreams crate

src/routes/blogs.rs

@@ -1,11 +1,11 @@
+use activitystreams_types::collection::OrderedCollection;
 use rocket::request::Form;
 use rocket::response::Redirect;
 use rocket_contrib::Template;
 use serde_json;
 
-use activity_pub::ActivityPub;
+use activity_pub::{ActivityStream, ActivityPub};
 use activity_pub::actor::Actor;
-use activity_pub::outbox::Outbox;
 use db_conn::DbConn;
 use models::blog_authors::*;
 use models::blogs::*;
@@ -78,7 +78,7 @@ fn create(conn: DbConn, data: Form<NewBlogForm>, user: User) -> Redirect {
 }
 
 #[get("/~/<name>/outbox")]
-fn outbox(name: String, conn: DbConn) -> Outbox {
+fn outbox(name: String, conn: DbConn) -> ActivityStream<OrderedCollection> {
     let blog = Blog::find_local(&*conn, name).unwrap();
     blog.outbox(&*conn)
 }

src/routes/comments.rs

@@ -2,8 +2,7 @@ use rocket::request::Form;
 use rocket::response::Redirect;
 use rocket_contrib::Template;
 
-use activity_pub::activity::Create;
-use activity_pub::outbox::broadcast;
+use activity_pub::broadcast;
 use db_conn::DbConn;
 use models::comments::*;
 use models::posts::Post;
@@ -41,8 +40,8 @@ fn create(blog: String, slug: String, query: CommentQuery, data: Form<NewComment
         sensitive: false,
         spoiler_text: "".to_string()
     });
-    let act = Create::new(&user, &comment, &*conn);
-    broadcast(&*conn, &user, act, user.get_followers(&*conn));
+
+    broadcast(&*conn, &user, comment.create_activity(&*conn), user.get_followers(&*conn));
 
     Redirect::to(format!("/~/{}/{}/#comment-{}", blog, slug, comment.id).as_ref())
 }

src/routes/likes.rs

@@ -1,7 +1,6 @@
 use rocket::response::Redirect;
 
-use activity_pub::activity::{Like, Undo};
-use activity_pub::outbox::broadcast;
+use activity_pub::broadcast;
 use db_conn::DbConn;
 use models::likes;
 use models::posts::Post;
@@ -18,12 +17,12 @@ fn create(blog: String, slug: String, user: User, conn: DbConn) -> Redirect {
                 ap_url: "".to_string()
         });
         like.update_ap_url(&*conn);
-        let act = Like::new(&user, &post, &*conn);
-        broadcast(&*conn, &user, act, user.get_followers(&*conn));
+
+        broadcast(&*conn, &user, like.into_activity(&*conn), user.get_followers(&*conn));
     } else {
         let like = likes::Like::find_by_user_on_post(&*conn, &user, &post).unwrap();
-        like.delete(&*conn);
-        broadcast(&*conn, &user, Undo::new(&user, &like, &*conn), user.get_followers(&*conn));
+        let delete_act = like.delete(&*conn);
+        broadcast(&*conn, &user, delete_act, user.get_followers(&*conn));
     }
 
     Redirect::to(format!("/~/{}/{}/", blog, slug).as_ref())

src/routes/posts.rs

@@ -4,10 +4,8 @@ use rocket::response::Redirect;
 use rocket_contrib::Template;
 use serde_json;
 
-use activity_pub::{context, activity_pub, ActivityPub};
-use activity_pub::activity::Create;
+use activity_pub::{broadcast, context, activity_pub, ActivityPub};
 use activity_pub::object::Object;
-use activity_pub::outbox::broadcast;
 use db_conn::DbConn;
 use models::blogs::*;
 use models::comments::Comment;
@@ -39,7 +37,7 @@ fn details(blog: String, slug: String, conn: DbConn, user: Option<User>) -> Temp
 
 #[get("/~/<_blog>/<slug>", rank = 3, format = "application/activity+json")]
 fn activity_details(_blog: String, slug: String, conn: DbConn) -> ActivityPub {
-    // TODO: posts in different blogs may have the same slug
+    // FIXME: posts in different blogs may have the same slug
     let post = Post::find_by_slug(&*conn, slug).unwrap();
 
     let mut act = post.serialize(&*conn);
@@ -86,7 +84,7 @@ fn create(blog_name: String, data: Form<NewPostForm>, user: User, conn: DbConn)
         author_id: user.id
     });
 
-    let act = Create::new(&user, &post, &*conn);
+    let act = post.create_activity(&*conn);
     broadcast(&*conn, &user, act, user.get_followers(&*conn));
 
     Redirect::to(format!("/~/{}/{}", blog_name, slug).as_str())

src/routes/user.rs

@@ -1,14 +1,17 @@
+use activitystreams_types::{
+    activity::Follow,
+    collection::OrderedCollection
+};
 use rocket::request::Form;
 use rocket::response::Redirect;
 use rocket_contrib::Template;
 use serde_json;
 
-use activity_pub::{activity, activity_pub, ActivityPub, context};
+use activity_pub::{activity_pub, ActivityPub, ActivityStream, context, broadcast, Id, IntoId};
 use activity_pub::actor::Actor;
 use activity_pub::inbox::Inbox;
-use activity_pub::outbox::{broadcast, Outbox};
 use db_conn::DbConn;
-use models::follows::*;
+use models::follows;
 use models::instance::Instance;
 use models::posts::Post;
 use models::users::*;
@@ -49,11 +52,15 @@ fn details(name: String, conn: DbConn, account: Option<User>) -> Template {
 #[get("/@/<name>/follow")]
 fn follow(name: String, conn: DbConn, user: User) -> Redirect {
     let target = User::find_by_fqn(&*conn, name.clone()).unwrap();
-    Follow::insert(&*conn, NewFollow {
+    follows::Follow::insert(&*conn, follows::NewFollow {
         follower_id: user.id,
         following_id: target.id
     });
-    broadcast(&*conn, &user, activity::Follow::new(&user, &target, &*conn), vec![target]);
+    let mut act = Follow::default();
+    act.set_actor_link::<Id>(user.clone().into_id()).unwrap();
+    act.set_object_object(user.into_activity(&*conn)).unwrap();
+    act.object_props.set_id_string(format!("{}/follow/{}", user.ap_url, target.ap_url)).unwrap();
+    broadcast(&*conn, &user, act, vec![target]);
     Redirect::to(format!("/@/{}", name).as_ref())
 }
 
@@ -152,7 +159,7 @@ fn create(conn: DbConn, data: Form<NewUserForm>) -> Result<Redirect, String> {
 }
 
 #[get("/@/<name>/outbox")]
-fn outbox(name: String, conn: DbConn) -> Outbox {
+fn outbox(name: String, conn: DbConn) -> ActivityStream<OrderedCollection> {
     let user = User::find_local(&*conn, name).unwrap();
     user.outbox(&*conn)
 }