New pattern for comment creation in code

Use the builder design pattern to build a NewComment

Add a function to transform a NewComment into a Create activity

Virtually send this activity to the shared inbox of the instance

src/routes/comments.rs

@@ -3,18 +3,19 @@ use rocket::{
     response::{Redirect, Flash}
 };
 use rocket_contrib::Template;
+use serde_json;
 
-use activity_pub::{broadcast, IntoId, inbox::Notify};
+use activity_pub::{broadcast, inbox::Inbox};
 use db_conn::DbConn;
 use models::{
     blogs::Blog,
     comments::*,
+    instance::Instance,
     posts::Post,
     users::User
 };
 
 use utils;
-use safe_string::SafeString;
 
 #[get("/~/<blog>/<slug>/comment")]
 fn new(blog: String, slug: String, user: User, conn: DbConn) -> Template {
@@ -43,23 +44,29 @@ struct NewCommentForm {
     pub content: String
 }
 
+// See: https://github.com/SergioBenitez/Rocket/pull/454
+#[post("/~/<blog_name>/<slug>/comment", data = "<data>")]
+fn create(blog_name: String, slug: String, data: Form<NewCommentForm>, user: User, conn: DbConn) -> Redirect {
+    create_response(blog_name, slug, None, data, user, conn)
+}
+
 #[post("/~/<blog_name>/<slug>/comment?<query>", data = "<data>")]
-fn create(blog_name: String, slug: String, query: CommentQuery, data: Form<NewCommentForm>, user: User, conn: DbConn) -> Redirect {
+fn create_response(blog_name: String, slug: String, query: Option<CommentQuery>, data: Form<NewCommentForm>, user: User, conn: DbConn) -> Redirect {
     let blog = Blog::find_by_fqn(&*conn, blog_name.clone()).unwrap();
     let post = Post::find_by_slug(&*conn, slug.clone(), blog.id).unwrap();
     let form = data.get();
-    let comment = Comment::insert(&*conn, NewComment {
-        content: SafeString::new(&form.content.clone()),
-        in_response_to_id: query.responding_to,
-        post_id: post.id,
-        author_id: user.id,
-        ap_url: None,
-        sensitive: false,
-        spoiler_text: "".to_string()
-    });
 
-    Comment::notify(&*conn, comment.into_activity(&*conn), user.clone().into_id());
-    broadcast(&*conn, &user, comment.create_activity(&*conn), user.get_followers(&*conn));
+    let (new_comment, id) = NewComment::build()
+        .content(form.content.clone())
+        .in_response_to_id(query.and_then(|q| q.responding_to))
+        .post(post)
+        .author(user.clone())
+        .create(&*conn);
 
-    Redirect::to(format!("/~/{}/{}/#comment-{}", blog_name, slug, comment.id))
+    // Comment::notify(&*conn, new_comment, user.clone().into_id());
+    let instance = Instance::get_local(&*conn).unwrap();
+    instance.received(&*conn, serde_json::to_value(new_comment.clone()).expect("JSON serialization error"));
+    broadcast(&*conn, &user, new_comment, user.get_followers(&*conn));
+
+    Redirect::to(format!("/~/{}/{}/#comment-{}", blog_name, slug, id))
 }

src/routes/posts.rs

@@ -21,7 +21,7 @@ use safe_string::SafeString;
 fn details(blog: String, slug: String, conn: DbConn, user: Option<User>) -> Template {
     may_fail!(Blog::find_by_fqn(&*conn, blog), "Couldn't find this blog", |blog| {
         may_fail!(Post::find_by_slug(&*conn, slug, blog.id), "Couldn't find this post", |post| {
-            let comments = Comment::find_by_post(&*conn, post.id);
+            let comments = Comment::list_by_post(&*conn, post.id);
 
             Template::render("posts/details", json!({
                 "author": post.get_authors(&*conn)[0].to_json(&*conn),